Changed the BINDIR in camlp4 to represent the same BINDIR than ocaml.

The installation of the camlp4 stuff, which does not change, is then done
in $BINDIR/camlp4.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

16 files changed, 46 insertions, 44 deletions

diff --git a/Makefile b/Makefile
index b72c764033..bd8c01ffc4 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ install: FORCE
           (cd otherlibs/$$i; $(MAKE) install) || exit $$?; \
         done
 	if test -f ocamlopt; then $(MAKE) installopt; else :; fi
-	cd camlp4; $(MAKE) install LIBDIR=$(LIBDIR)/camlp4
+	cd camlp4; $(MAKE) install LIBDIR=$(LIBDIR)
 	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); else :; fi
 
 # Installation of the native-code compiler
diff --git a/camlp4/camlp4/Makefile b/camlp4/camlp4/Makefile
index eee846fc6c..3217fee763 100644
--- a/camlp4/camlp4/Makefile
+++ b/camlp4/camlp4/Makefile
@@ -62,9 +62,10 @@ compare:
 
 install:
 	-$(MKDIR) $(BINDIR)
+	-$(MKDIR) $(LIBDIR)/camlp4
 	cp $(CAMLP4) $(BINDIR)/.
-	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/.
-	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/.
-	cp camlp4.cma $(LIBDIR)/.
+	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/camlp4/.
+	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/camlp4/.
+	cp camlp4.cma $(LIBDIR)/camlp4/.
 
 include .depend
diff --git a/camlp4/config/Makefile-nt.cnf b/camlp4/config/Makefile-nt.cnf
index a2a0154bc4..379f338507 100644
--- a/camlp4/config/Makefile-nt.cnf
+++ b/camlp4/config/Makefile-nt.cnf
@@ -3,5 +3,5 @@ OPT=
 OTOP=../..
 OLIBDIR=$(OTOP)/boot
 BINDIR=C:/ocaml/bin
-LIBDIR=C:/ocaml/lib/camlp4
+LIBDIR=C:/ocaml/lib
 MANDIR=C:/ocaml/man
diff --git a/camlp4/etc/Makefile b/camlp4/etc/Makefile
index dfa82b4b69..9e3205a210 100644
--- a/camlp4/etc/Makefile
+++ b/camlp4/etc/Makefile
@@ -48,10 +48,10 @@ depend:
 get_promote:
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp $(OBJS) $(LIBDIR)/.
-	cp $(INTF) $(LIBDIR)/.
-	cp lib.sml $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp $(OBJS) $(LIBDIR)/camlp4/.
+	cp $(INTF) $(LIBDIR)/camlp4/.
+	cp lib.sml $(LIBDIR)/camlp4/.
 	cp camlp4o$(EXE) $(BINDIR)/.
 	if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
 	cp mkcamlp4.sh $(BINDIR)/mkcamlp4
diff --git a/camlp4/etc/mkcamlp4.sh.tpl b/camlp4/etc/mkcamlp4.sh.tpl
index e4657a63b8..2fd04ae8cd 100755
--- a/camlp4/etc/mkcamlp4.sh.tpl
+++ b/camlp4/etc/mkcamlp4.sh.tpl
@@ -2,7 +2,7 @@
 # $Id$
 
 OLIB=`ocamlc -where`
-LIB=LIBDIR
+LIB=LIBDIR/camlp4
 
 INTERFACES=
 OPTS=
diff --git a/camlp4/lib/Makefile b/camlp4/lib/Makefile
index 2d3895fafa..5243e3dc4d 100644
--- a/camlp4/lib/Makefile
+++ b/camlp4/lib/Makefile
@@ -36,17 +36,17 @@ compare:
 	done
 
 install:
-	-$(MKDIR) $(LIBDIR)
-	cp $(TARGET) *.mli $(LIBDIR)/.
-	cp *.cmi $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4
+	cp $(TARGET) *.mli $(LIBDIR)/camlp4/.
+	cp *.cmi $(LIBDIR)/camlp4/.
 	if test -f $(TARGET:.cma=.cmxa); then $(MAKE) installopt LIBDIR=$(LIBDIR); fi
 
 installopt:
-	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/.
+	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
 	if test -f $(TARGET:.cma=.lib); then \
-		cp $(TARGET:.cma=.lib) $(LIBDIR)/.; \
+		cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
 	else \
-		tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/.; tar xf -); \
+		tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \
 	fi
 
 include .depend
diff --git a/camlp4/man/camlp4.1.tpl b/camlp4/man/camlp4.1.tpl
index 0fc617b888..1042f2e47a 100644
--- a/camlp4/man/camlp4.1.tpl
+++ b/camlp4/man/camlp4.1.tpl
@@ -181,7 +181,7 @@ Added by pa_ifdef.cmo: define the ident.
 Added by pa_ifdef.cmo: undefine the ident.
 
 .SH "PROVIDED FILES"
-These files are installed in the directory LIBDIR.
+These files are installed in the directory LIBDIR/camlp4.
 
 .LP
 Parsing files:
@@ -262,7 +262,7 @@ the OCaml module "str":
 .SH "FILES"
 Camlp4 library directory in the present installation:
 .br
-LIBDIR
+LIBDIR/camlp4
 
 .SH "SEE ALSO"
 Camlp4 - tutorial
diff --git a/camlp4/meta/Makefile b/camlp4/meta/Makefile
index b4e66984fc..d26438d91a 100644
--- a/camlp4/meta/Makefile
+++ b/camlp4/meta/Makefile
@@ -42,9 +42,9 @@ compare:
 	done
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp $(OBJS) $(LIBDIR)/.
-	cp pa_ifdef.cmi $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp $(OBJS) $(LIBDIR)/camlp4/.
+	cp pa_ifdef.cmi $(LIBDIR)/camlp4/.
 	cp camlp4r$(EXE) $(BINDIR)/.
 	if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
 
diff --git a/camlp4/ocaml_src/camlp4/Makefile b/camlp4/ocaml_src/camlp4/Makefile
index 752612b4bd..124af00af4 100644
--- a/camlp4/ocaml_src/camlp4/Makefile
+++ b/camlp4/ocaml_src/camlp4/Makefile
@@ -62,9 +62,10 @@ compare:
 
 install:
 	-$(MKDIR) $(BINDIR)
+	-$(MKDIR) $(LIBDIR)/camlp4
 	cp $(CAMLP4) $(BINDIR)/.
-	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/.
-	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/.
-	cp camlp4.cma $(LIBDIR)/.
+	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/camlp4/.
+	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/camlp4/.
+	cp camlp4.cma $(LIBDIR)/camlp4/.
 
 include .depend
diff --git a/camlp4/ocaml_src/lib/Makefile b/camlp4/ocaml_src/lib/Makefile
index dc6774d9f7..254b6161f2 100644
--- a/camlp4/ocaml_src/lib/Makefile
+++ b/camlp4/ocaml_src/lib/Makefile
@@ -36,17 +36,17 @@ compare:
 	done
 
 install:
-	-$(MKDIR) $(LIBDIR)
-	cp $(TARGET) *.mli $(LIBDIR)/.
-	cp *.cmi $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4
+	cp $(TARGET) *.mli $(LIBDIR)/camlp4/.
+	cp *.cmi $(LIBDIR)/camlp4/.
 	if test -f $(TARGET:.cma=.cmxa); then $(MAKE) installopt LIBDIR=$(LIBDIR); fi
 
 installopt:
-	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/.
+	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
 	if test -f $(TARGET:.cma=.lib); then \
-		cp $(TARGET:.cma=.lib) $(LIBDIR)/.; \
+		cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
 	else \
-		tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/.; tar xf -); \
+		tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \
 	fi
 
 include .depend
diff --git a/camlp4/ocaml_src/meta/Makefile b/camlp4/ocaml_src/meta/Makefile
index d0bfc892c3..a4decb9d79 100644
--- a/camlp4/ocaml_src/meta/Makefile
+++ b/camlp4/ocaml_src/meta/Makefile
@@ -42,9 +42,9 @@ compare:
 	done
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp $(OBJS) $(LIBDIR)/.
-	cp pa_ifdef.cmi $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp $(OBJS) $(LIBDIR)/camlp4/.
+	cp pa_ifdef.cmi $(LIBDIR)/camlp4/.
 	cp camlp4r$(EXE) $(BINDIR)/.
 	if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
 
diff --git a/camlp4/ocaml_src/odyl/Makefile b/camlp4/ocaml_src/odyl/Makefile
index d048baddb6..5d3be43cf0 100644
--- a/camlp4/ocaml_src/odyl/Makefile
+++ b/camlp4/ocaml_src/odyl/Makefile
@@ -31,7 +31,7 @@ odyl_main.cmx: odyl_main.ml
 odyl_config.ml:
 	echo "let standard_library =" > odyl_config.ml
 	echo "  try Sys.getenv \"CAMLP4LIB\" with" >> odyl_config.ml
-	echo "    Not_found -> \"$(LIBDIR)\"" >> odyl_config.ml
+	echo "    Not_found -> \"$(LIBDIR)/camlp4\"" >> odyl_config.ml
 
 clean::
 	rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt *.a
@@ -49,8 +49,8 @@ promote:
 compare:
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp odyl.cmo odyl.cma $(LIBDIR)
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
 	cp odyl$(EXE) $(BINDIR)/.
 
 include .depend
diff --git a/camlp4/ocpp/Makefile b/camlp4/ocpp/Makefile
index 166611aa48..79a4d8807d 100644
--- a/camlp4/ocpp/Makefile
+++ b/camlp4/ocpp/Makefile
@@ -24,8 +24,8 @@ clean::
 	rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak crc.ml ocpp$(EXE)
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp $(OBJS) $(LIBDIR)
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp $(OBJS) $(LIBDIR)/camlp4/.
 	cp ocpp$(EXE) $(BINDIR)/.
 
 depend:
diff --git a/camlp4/odyl/Makefile b/camlp4/odyl/Makefile
index 61d4d103cb..5f3f99ad43 100644
--- a/camlp4/odyl/Makefile
+++ b/camlp4/odyl/Makefile
@@ -31,7 +31,7 @@ odyl_main.cmx: odyl_main.ml
 odyl_config.ml:
 	echo "let standard_library =" > odyl_config.ml
 	echo "  try Sys.getenv \"CAMLP4LIB\" with" >> odyl_config.ml
-	echo "    Not_found -> \"$(LIBDIR)\"" >> odyl_config.ml
+	echo "    Not_found -> \"$(LIBDIR)/camlp4\"" >> odyl_config.ml
 
 clean::
 	rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt *.a
@@ -49,8 +49,8 @@ promote:
 compare:
 
 install:
-	-$(MKDIR) $(LIBDIR) $(BINDIR)
-	cp odyl.cmo odyl.cma $(LIBDIR)
+	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+	cp odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
 	cp odyl$(EXE) $(BINDIR)/.
 
 include .depend
diff --git a/camlp4/top/Makefile b/camlp4/top/Makefile
index 778bb4ddf8..d2af76ac1c 100644
--- a/camlp4/top/Makefile
+++ b/camlp4/top/Makefile
@@ -41,7 +41,7 @@ depend:
 get_promote:
 
 install:
-	-$(MKDIR) $(LIBDIR)
-	cp $(TARGET) $(LIBDIR)/.
+	-$(MKDIR) $(LIBDIR)/camlp4
+	cp $(TARGET) $(LIBDIR)/camlp4/.
 
 include .depend
diff --git a/configure b/configure
index 6f3b50b08e..880f88202c 100755
--- a/configure
+++ b/configure
@@ -1205,7 +1205,7 @@ fi
 
 (
 cd ../../camlp4/config
-EXE=$exe ./configure_batch -bindir "$bindir" -libdir "$libdir/camlp4" -mandir "$mandir" -ocaml-top ../.. > /dev/null
+EXE=$exe ./configure_batch -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null
 )
 
 # Finish generated files