[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. f4d263293baabc9560a977dc7c81d598088139b6

Stefano Zacchiroli zack at upsilon.cc
Wed Apr 16 20:49:21 UTC 2008


The following commit has been merged in the master branch:
commit 0270d01bc3dc94f2c8e2f606f5f632211230f7ba
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Apr 16 22:29:45 2008 +0200

    avoid modifying system-wide ld.conf

diff --git a/make/Makefile.common b/make/Makefile.common
index 19ac256..01aadf0 100644
--- a/make/Makefile.common
+++ b/make/Makefile.common
@@ -29,7 +29,7 @@ endif
 install:
 	{ test ! -f $(XARCHIVE) || extra1="*.cmxa *.a"; }; \
 	{ test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)"; }; \
-	$(OCAMLFIND) install $(DESTFLAG) $(NAME) *.mli *.cmi *.cma META $$extra1 $(extra2)
+	$(OCAMLFIND) install -ldconf dummy.ld.conf $(DESTFLAG) $(NAME) *.mli *.cmi *.cma META $$extra1 $(extra2)
 
 .PHONY: uninstall
 uninstall:
@@ -42,6 +42,7 @@ clean:
 	@rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa
 	@rm -f $(EXEC) $(XEXEC)
 	@rm -f *.annot
+	@rm -f dummy.ld.conf
 	@rm -f doc/*
 
 .PHONY: doc

-- 
dose2 packaging



More information about the Pkg-ocaml-maint-commits mailing list