diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2003-07-03 16:14:49 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2003-07-03 16:14:49 +0000 |
| commit | ba929756321c56885f280d2f3bccf35a0116baf6 (patch) | |
| tree | 431bacb72a7c4973f6b44d5124c7a282ea85b8e7 | |
| parent | b0a3c8014ba5eacad56670d4501ad241dd7debe8 (diff) | |
Revu config Camlp4 sous Windows
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5652 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile.nt | 10 | ||||
| -rw-r--r-- | camlp4/man/Makefile | 10 | ||||
| -rw-r--r-- | config/Makefile.mingw | 2 | ||||
| -rw-r--r-- | config/Makefile.msvc | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/Makefile.nt b/Makefile.nt index 0bc032fe3..ddc9e3097 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -556,7 +556,15 @@ alldepend:: # Camlp4 camlp4out: - cd camlp4/config ; cat Makefile.tpl Makefile-nt.cnf > Makefile + cd camlp4/config ; \ + (cat Makefile.tpl; \ + echo 'EXE=.exe'; \ + echo 'OPT='; \ + echo 'OTOP=../..'; \ + echo 'OLIBDIR=$$(OTOP)/boot'; \ + echo 'BINDIR=$(BINDIR)'; \ + echo 'LIBDIR=$(LIBDIR)'; \ + echo 'MANDIR=' ) > Makefile cd camlp4 ; $(MAKE) camlp4opt: cd camlp4 ; $(MAKE) opt diff --git a/camlp4/man/Makefile b/camlp4/man/Makefile index c04d34325..a7aa30347 100644 --- a/camlp4/man/Makefile +++ b/camlp4/man/Makefile @@ -15,12 +15,14 @@ depend: get_promote: install: - -$(MKDIR) $(MANDIR)/man1 - -cp $(TARGET) $(MANDIR)/man1/. - -for i in $(ALIASES); do \ + if test -n '$(MANDIR)'; then \ + $(MKDIR) $(MANDIR)/man1 ; \ + cp $(TARGET) $(MANDIR)/man1/. ; \ + for i in $(ALIASES); do \ rm -f $(MANDIR)/man1/$$i; \ echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ - done + done; \ + fi camlp4.1: camlp4.1.tpl sed -e "s'LIBDIR'$(LIBDIR)'g" camlp4.1.tpl > camlp4.1 diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 9a0e8dd8c..77fb6bec7 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -20,11 +20,9 @@ PREFIX=C:/ocamlmgw ### Where to install the binaries -# If you change this, also change camlp4/config/Makefile-nt.cnf BINDIR=$(PREFIX)/bin ### Where to install the standard library -# If you change this, also change camlp4/config/Makefile-nt.cnf LIBDIR=$(PREFIX)/lib ### Where to install the stub DLLs diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 4e3c26456..7144f9e01 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -20,11 +20,9 @@ PREFIX=C:/ocaml ### Where to install the binaries. -# If you change this, also change camlp4/config/Makefile-nt.cnf BINDIR=$(PREFIX)/bin ### Where to install the standard library -# If you change this, also change camlp4/config/Makefile-nt.cnf LIBDIR=$(PREFIX)/lib ### Where to install the stub DLLs |