X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Fmlminidom%2FMakefile.in;h=1e4dfdd8f1aedde1133654a077ab01e718472bd6;hb=1c7fb836e2af4f2f3d18afd0396701f2094265ff;hp=ecd1c83869c85b2be86ed9aea5ddff5ea04b25b0;hpb=8b153648f7da53fcf96ef61f20239e73a9634146;p=helm.git

diff --git a/helm/DEVEL/mlminidom/Makefile.in b/helm/DEVEL/mlminidom/Makefile.in
index ecd1c8386..1e4dfdd8f 100644
--- a/helm/DEVEL/mlminidom/Makefile.in
+++ b/helm/DEVEL/mlminidom/Makefile.in
@@ -1,7 +1,6 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 INCLUDEDIR = @OCAML_INCLUDE_DIR@
-LIBDIR = @OCAML_LIB_DIR@
 PREFIX = 
 OBJECTS_C = ml_minidom.o
 OBJECTS = minidom.cmo ominidom.cmo
@@ -14,6 +13,7 @@ PREDICATES =
 OCAMLC = ocamlfind ocamlc
 OCAMLOPT = ocamlfind ocamlopt
 OCAMLDEP = ocamldep
+DESTDIR = @OCAML_LIB_DIR@
 
 ARCHIVE = $(PACKAGE).cma
 ARCHIVE_C = $(PACKAGE).a
@@ -53,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)
@@ -75,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