Initial revision

[helm.git] / helm / DEVEL / mlminidom / Makefile.in

diff --git a/helm/DEVEL/mlminidom/Makefile.in b/helm/DEVEL/mlminidom/Makefile.in
index 802da6faff37f840e32ffdaab9add50b6a54ad89..1e4dfdd8f1aedde1133654a077ab01e718472bd6 100644 (file)
--- a/helm/DEVEL/mlminidom/Makefile.in
+++ b/helm/DEVEL/mlminidom/Makefile.in
@@ -13,6 +13,7 @@ PREDICATES =
 OCAMLC = ocamlfind ocamlc
 OCAMLOPT = ocamlfind ocamlopt
 OCAMLDEP = ocamldep
+DESTDIR = @OCAML_LIB_DIR@
 
 ARCHIVE = $(PACKAGE).cma
 ARCHIVE_C = $(PACKAGE).a
@@ -65,7 +66,7 @@ test: test.ml $(OBJECTS_C) $(ARCHIVE)
        mkdir -p $(TMPPKGDIR)
        cp $(OBJECTS_C) $(ARCHIVE) $(INST) $(TMPPKGDIR)
        cp test.ml $(TMPDIR)
-       cd $(TMPDIR) ; export OCAMLPATH=. ; \
+       cd $(TMPDIR) ; export OCAMLPATH=.:$$OCAMLPATH ; \
        $(OCAMLC) -package "$(PACKAGE)" -linkpkg -predicates "" -o $@ test.ml
        mv $(TMPDIR)/$@ .
        rm -r $(TMPDIR)
@@ -74,14 +75,14 @@ test.opt: test.ml $(OBJECTS_C) $(ARCHIVE_C) $(ARCHIVE_OPT)
        mkdir -p $(TMPPKGDIR)
        cp $(OBJECTS_C) $(ARCHIVE_C) $(ARCHIVE_OPT) $(INST) $(TMPPKGDIR)
        cp test.ml $(TMPDIR)
-       cd $(TMPDIR) ; export OCAMLPATH=. ; \
+       cd $(TMPDIR) ; export OCAMLPATH=.:$$OCAMLPATH ; \
        $(OCAMLOPT) -package "$(PACKAGE)" -linkpkg -predicates "" -o $@ test.ml
        mv $(TMPDIR)/$@ .
        rm -r $(TMPDIR)
 
 install:
        test ! -f $(ARCHIVE_OPT) || extra="$(ARCHIVE_C) $(ARCHIVE_OPT)" ; \
-       ocamlfind install $(PACKAGE) $(OBJECTS_C) $(ARCHIVE) $(INST) $$extra
+       ocamlfind install -destdir $(DESTDIR) $(PACKAGE) $(OBJECTS_C) $(ARCHIVE) $(INST) $$extra
 
 uninstall:
        ocamlfind remove $(PACKAGE)