diff options
| author | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2001-09-09 08:22:46 +0000 |
|---|---|---|
| committer | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2001-09-09 08:22:46 +0000 |
| commit | 25d80995640198f79b409f76be9cfe3167de08a3 (patch) | |
| tree | e556db97387fd095ad04c65ae3f41b3ba41e979b | |
| parent | 8944b6d050bc6ed9337bf948681ee9982ffeddd4 (diff) | |
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3738 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | camlp4/config/Makefile-nt.cnf | 5 | ||||
| -rw-r--r-- | camlp4/config/Makefile.tpl | 1 | ||||
| -rwxr-xr-x | camlp4/config/configure_batch | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/camlp4/config/Makefile-nt.cnf b/camlp4/config/Makefile-nt.cnf index 955f79cd8..01987cec7 100644 --- a/camlp4/config/Makefile-nt.cnf +++ b/camlp4/config/Makefile-nt.cnf @@ -1,8 +1,7 @@ - EXE=.exe -OTOP=../.. OPT= -OLIBDIR=C:/ocaml/lib +OTOP=../.. +OLIBDIR=$(OTOP)/boot BINDIR=C:/ocaml/bin LIBDIR=C:/camlp4/lib MANDIR=C:/camlp4/man diff --git a/camlp4/config/Makefile.tpl b/camlp4/config/Makefile.tpl index bc0c92890..0602525a6 100644 --- a/camlp4/config/Makefile.tpl +++ b/camlp4/config/Makefile.tpl @@ -25,3 +25,4 @@ MKDIR=mkdir -p @$(CAMLP4_COMM) $< -o $*.ppo $(OCAMLOPT) $(OCAMLCFLAGS) -c -impl $*.ppo rm -f $*.ppo + diff --git a/camlp4/config/configure_batch b/camlp4/config/configure_batch index b55cb8e09..9e6bd6c3c 100755 --- a/camlp4/config/configure_batch +++ b/camlp4/config/configure_batch @@ -104,7 +104,6 @@ esac rm -f Makefile cat Makefile.tpl > Makefile -echo >> Makefile cat Makefile.cnf >> Makefile echo "Resulting configuration file (Makefile.cnf):" |