summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camlp4/config/Makefile-nt.cnf5
-rw-r--r--camlp4/config/Makefile.tpl1
-rwxr-xr-xcamlp4/config/configure_batch1
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):"