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

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit abc41d28c151a7c649307828452a7424d4f1e202
Merge: f4d263293baabc9560a977dc7c81d598088139b6 274c9f2dd398945ab4903f814ee4141beb11dc3a
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Apr 16 22:51:35 2008 +0200

    Merge branch 'flexible-make'

diff --combined make/Makefile.common
index 01aadf0,319799e..4e58c36
--- a/make/Makefile.common
+++ b/make/Makefile.common
@@@ -29,7 -29,7 +29,7 @@@ endi
  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:
@@@ -39,10 -39,9 +39,10 @@@
  clean:
  	@echo CLN
  	@rm -f *.mld
- 	@rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa
+ 	@rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *.so
  	@rm -f $(EXEC) $(XEXEC)
  	@rm -f *.annot
 +	@rm -f dummy.ld.conf
  	@rm -f doc/*
  
  .PHONY: doc

-- 
dose2 packaging