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
2001-12-24 10:21:09 +00:00 · 2001-12-24 10:21:09 +00:00 · ee954d84d3
parent 98bc4a533f
commit ee954d84d3
16 changed files with 46 additions and 44 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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=
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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:
--- 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
--- 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
--- a/2
+++ b/2
@ -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