[r2003-10-24 09:24:02 by szach] use ocamlc -where instead of hard coded /usr/lib/ocaml/...

Original author: szach
Date: 2003-10-24 09:24:02+00:00

Makefile

@@ -61,21 +61,22 @@ package: clean
 	tar czf $(PACKAGE).tar.gz --exclude CVS --exclude ".#*" $(PACKAGE)
 	rm -Rf $(PACKAGE)
 
+OCAML_STDLIBDIR := $(shell ocamlc -where)
 .PHONY: .ocamlinit
 .ocamlinit:
 	echo '(* AUTOMATICALLY GENERATED by Makefile: DO NOT EDIT! *)' > $@
-	echo '#load "/usr/lib/ocaml/3.07/pcre/pcre.cma";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/unix.cma";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/netstring/netstring.cma";;' >> $@
-# 	echo '#load "/usr/lib/ocaml/3.07/netstring/netstring_top.cmo";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/pxp-engine/pxp_engine.cma";;' >> $@
-# 	echo '#load "/usr/lib/ocaml/3.07/pxp-engine/pxp_top.cmo";;' *)' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/pxp-lex-iso88591/pxp_lex_iso88591.cma";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/pxp-lex-iso88591/pxp_lex_link_iso88591.cmo";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/ulex/ulexing.cma";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/nums.cma";;' >> $@
-# 	echo '#load "/usr/lib/ocaml/3.07/num_top.cma";;' >> $@
-	echo '#load "/usr/lib/ocaml/3.07/cgi/cgi.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/pcre/pcre.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/unix.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/netstring/netstring.cma";;' >> $@
+# 	echo '#load "$(OCAML_STDLIBDIR)/netstring/netstring_top.cmo";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/pxp-engine/pxp_engine.cma";;' >> $@
+# 	echo '#load "$(OCAML_STDLIBDIR)/pxp-engine/pxp_top.cmo";;' *)' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/pxp-lex-iso88591/pxp_lex_iso88591.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/pxp-lex-iso88591/pxp_lex_link_iso88591.cmo";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/ulex/ulexing.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/nums.cma";;' >> $@
+# 	echo '#load "$(OCAML_STDLIBDIR)/num_top.cma";;' >> $@
+	echo '#load "$(OCAML_STDLIBDIR)/cgi/cgi.cma";;' >> $@
 	for o in $(VALIDATE_OBJECTS); do echo "prerr_endline \"Loading $$o ...\";;" >> $@; echo "#load \"$$o\";;" >> $@; done
 	for d in $(DIRS); do echo "#directory \"$$d\";;" >> $@; done
 	for p in pcre netstring pxp-engine ulex cgi; do echo "#directory \"`$(OCAMLFIND) query $$p`\";;" >> $@; done