[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.3-1-16-g54647b3

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 4d4dfd320b925af0148e5c63429c6cb6fa591ac8
Merge: 62c1d7c96551a34f4770cca369eb8046dec26a66 9ea2836374de4262e3761dc3a94dd445737f0d3f
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Jul 17 16:17:26 2008 +0200

    merge upstream release 1.3.2
    
    Merge commit 'upstream/1.3.2'
    
    Conflicts:
    
    	Makefile.config.in
    	Makefile.in
    	configure.ac
    	ocamlrpm/Makefile

diff --combined Makefile.config.in
index 7735670,b0ad20d..ef52c31
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@@ -6,7 -6,8 +6,8 @@@ OBJS=	$(C_SOURCES:%.c=%.o
  OCAMLC=		@OCAMLFIND@ ocamlc
  OCAMLOPT=	@OCAMLFIND@ ocamlopt
  OCAMLMKLIB=	@OCAMLMKLIB@
 -CFLAGS=	@DEFS@ @CFLAGS@
 -CPPFLAGS=	@CPPFLAGS@
 +override CFLAGS=	@DEFS@ @CFLAGS@
++override CPPFLAGS=	@CPPFLAGS@
  LDFLAGS=	@LDFLAGS@
  LIBS=	@LIBS@
  
@@@ -48,13 -49,13 +49,14 @@@ endi
  
  .PHONY: clean depend cmi-install
  clean:
- 	rm -f $(CMOS) $(CMIS) $(CMXS) $(NAME).cma $(NAME).cmxa $(EXTRA_INSTALL) $(EXTRA_CLEAN) .depend
- 	rm -f *.o *.a *.so *.mlid *.cmi
+ 	@rm -f $(CMOS) $(CMIS) $(CMXS:.cmx=.o) $(CMXS) $(OBJS) $(NAME).a $(NAME).cma $(NAME).cmxa $(EXTRA_INSTALL) $(EXTRA_CLEAN) .depend
++	@rm -f *.o *.a *.so *.mlid *.cmi
+ 	@touch .depend
  
  depend:
  	@OCAMLDEP@ $(SOURCES) $(MLIS) > .depend	
  ifdef C_SOURCES
- 	$(CC) -MM $(CFLAGS) $(C_SOURCES) >> .depend	
+ 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(C_SOURCES) >> .depend	
  endif
  
  cmi-install:
diff --combined Makefile.in
index 942d37c,d87196c..8bc4d7b
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,33 -1,22 +1,33 @@@
  DIRS=  util io napkin ocamlrpm ocamldeb conduit lifetime dosebase progress \
-        rapids satsolver packetology dql
+        rapids satsolver packetology 
  CMAS=  util/util.cma ocamlrpm/ocamlrpm.cma ocamldeb/ocamldeb.cma \
         conduit/conduit.cma io/io.cma lifetime/lifetime.cma napkin/napkin.cma \
         dosebase/dosebase.cma progress/progress.cma rapids/rapids.cma \
- 			 satsolver/satsolver.cma packetology/packetology.cma dql/dql.cma
+ 			 satsolver/satsolver.cma packetology/packetology.cma 
  CMXAS=	$(CMAS:%.cma=%.cmxa)
  ARCHIVES=	$(CMAS:%.cma=%.a)
 +DIRTS = \
 +	Makefile \
 +	Makefile.config \
 +	config.h \
 +	config.log \
 +	config.status \
 +	dql/Makefile \
 +	io/Makefile \
 +	ocamldeb/Makefile \
 +	META \
 +	$(NULL)
  
 -all: @BEST@
 +all: depend @BEST@
  
  bcl:
  	@for i in $(DIRS); do \
- 		$(MAKE) -C $$i bcl; \
+ 		$(MAKE) -C $$i bcl || exit; \
  	done
  
  ncl:
  	@for i in $(DIRS); do \
- 		$(MAKE) -C $$i ncl; \
+ 		$(MAKE) -C $$i ncl || exit; \
  	done
  
  .PHONY: clean depend install
@@@ -36,7 -25,6 +36,7 @@@ clean
  	@for i in $(DIRS); do \
  		$(MAKE) -C $$i clean; \
  	done
 +	rm -f $(DIRTS)
  
  depend:
  	@for i in $(DIRS); do \
@@@ -44,18 -32,13 +44,19 @@@
  		$(MAKE) -C $$i depend; \
  	done
  
 -install: @BEST@
 -	- at OCAMLFIND@ remove dose2
 +ifneq ($(DESTDIR),)
 +DESTDIR_FLAGS = -destdir $(DESTDIR)
 +$(DESTDIR):
 +	mkdir -p $(DESTDIR)
 +endif
 +
 +install: @BEST@ $(DESTDIR)
++	- at OCAMLFIND@ remove $(DESTDIR_FLAGS) dose2
  ifeq (@OCAMLBEST@, byte)
 -	@OCAMLFIND@ install -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
  else
 -	@OCAMLFIND@ install -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
  endif	
  	@for i in $(DIRS); do \
 -		$(MAKE) -C $$i cmi-install extra-install; \
 +		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR)/dose2; \
  	done
diff --combined ocamlrpm/Makefile
index 5f0fd0d,4970442..77dc3ae
--- a/ocamlrpm/Makefile
+++ b/ocamlrpm/Makefile
@@@ -10,4 -10,4 +10,4 @@@ REQUIRES=	napki
  include ../Makefile.config
  include .depend
  
- override CFLAGS+=	-I..
 -CFLAGS+=	-I.. -fPIC
++override CFLAGS+=	-I.. -fPIC

-- 
dose2 packaging