- the mathql interpreter is not helm-dependent any more

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

diff --git a/helm/DEVEL/mlminidom/Makefile.in b/helm/DEVEL/mlminidom/Makefile.in
index 7f88f872be2693e84a0aed9b860dcb32dee4dd04..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
@@ -52,20 +53,20 @@ depend: *.ml *.mli
 include .depend
 
 $(ARCHIVE): $(OBJECTS)
-       $(OCAMLC) -a -custom -package "$(REQUIRES)" -linkpkg \
-        -predicates "$(PREDICATES)" -o $@ $< \
+       $(OCAMLC) -a -custom -package "$(REQUIRES)" \
+        -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `minidom-config --libs`"
 
 $(ARCHIVE_OPT): $(OBJECTS_OPT)
-       $(OCAMLOPT) -a -package "$(REQUIRES)" -linkpkg \
-        -predicates "$(PREDICATES)" -o $@ $< \
+       $(OCAMLOPT) -a -package "$(REQUIRES)" \
+        -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `minidom-config --libs`"
 
 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,20 +75,20 @@ 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)
 
 clean:
-       rm -f *.o *.cm? test test.opt mlminidom.cma mlminidom.cmxa mlminidom.a
+       rm -f *.o *.cm? test test.opt $(ARCHIVE) $(ARCHIVE_C) $(ARCHIVE_OPT)
        rm -rf $(TMPDIR)
 
 distclean: clean