[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.3.2-1-11-g4f0dc9b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 96a3a3f65be4c1539d74d979e14a76b44b4c26a1
Merge: 00b9666e72497a95d78c08246ce26990eb1f7e86 43c0a948c4038511170728867481c40c731e5cf0
Author: Ralf Treinen <rt at free.fr>
Date:   Tue Mar 17 23:51:22 2009 +0100

    Merge commit 'upstream/1.4'
    
    Conflicts:
    	Makefile.config.in
    	Makefile.in

diff --combined Makefile.config.in
index 607898c,3ffbd94..2c3d163
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@@ -7,12 -7,19 +7,19 @@@ OCAMLC=		@OCAMLFIND@ ocaml
  OCAMLCP=	@OCAMLFIND@ ocamlcp
  OCAMLOPT=	@OCAMLFIND@ ocamlopt
  OCAMLMKLIB=	@OCAMLMKLIB@
 +override CFLAGS=	@DEFS@ @CFLAGS@
 +override CPPFLAGS=	@CPPFLAGS@
+ OCAMLFIND = @OCAMLFIND@
  LDFLAGS=	@LDFLAGS@
  LIBS=	@LIBS@
  
- INSTALLDIR:= $(shell @OCAMLFIND@ printconf destdir)/dose2
+ ifeq ($(DESTDIR),)
+ INSTALLDIR = $(shell $(OCAMLFIND) printconf destdir)/dose2
+ STUBDIR = $(shell $(OCAMLC) -where)/stublibs
+ else
+ INSTALLDIR = $(DESTDIR)/dose2
+ STUBDIR = $(DESTDIR)/stublibs
+ endif
  
  ifdef REQUIRES
  OCAML_CFLAGS+=	$(REQUIRES:%=-I ../%)
@@@ -56,10 -63,9 +63,9 @@@ els
  	$(OCAMLMKLIB) -o $(NAME) $(OBJS) $(LDFLAGS) $(LIBS)
  endif
  
- .PHONY: clean depend cmi-install
+ .PHONY: clean depend cmi-install extra-install stub-install
  clean:
- 	@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
+ 	@rm -f $(CMOS) $(CMIS) $(CMXS:.cmx=.o) $(CMXS) $(OBJS) $(NAME).a $(NAME).cma $(NAME).cmxa $(STUB_INSTALL) $(EXTRA_CLEAN) .depend
  	@touch .depend
  
  depend:
@@@ -75,3 -81,8 +81,8 @@@ extra-install
  ifdef EXTRA_INSTALL
  	install $(EXTRA_INSTALL) $(INSTALLDIR)
  endif
+ 
+ stub-install:
+ ifdef STUB_INSTALL
+ 	install $(STUB_INSTALL) $(STUBDIR)
+ endif
diff --combined Makefile.in
index 79ac337,161e573..48fa086
--- a/Makefile.in
+++ b/Makefile.in
@@@ -7,19 -7,18 +7,29 @@@ CMAS=  util/util.cma ocamlrpm/ocamlrpm.
         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)
  
+ OCAMLFIND = @OCAMLFIND@
+ ifeq ($(DESTDIR),)
+ INSTALL = $(OCAMLFIND) install
+ UNINSTALL = $(OCAMLFIND) remove
+ DESTDIR = $(shell $(OCAMLFIND) printconf destdir)
+ else
+ INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)
+ UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)
+ endif
+ 
 -all: @BEST@
 +all: depend @BEST@
  
  bcl:
  	@for i in $(DIRS); do \
@@@ -42,7 -41,6 +52,7 @@@ clean
  	@for i in $(DIRS); do \
  		$(MAKE) -C $$i clean; \
  	done
 +	rm -f $(DIRTS)
  
  depend:
  	@for i in $(DIRS); do \
@@@ -50,19 -48,14 +60,20 @@@
  		$(MAKE) -C $$i depend; \
  	done
  
 -install: @BEST@
 -	-$(UNINSTALL) dose2
 +ifneq ($(DESTDIR),)
 +DESTDIR_FLAGS = -destdir $(DESTDIR)
 +$(DESTDIR):
 +	mkdir -p $(DESTDIR)
 +endif
 +
 +install: @BEST@ $(DESTDIR)
 +	- at OCAMLFIND@ remove $(DESTDIR_FLAGS) dose2
  ifeq (@OCAMLBEST@, byte)
 -	$(INSTALL) -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
  else
 -	$(INSTALL) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
  endif	
+ 	install -d $(DESTDIR)/stublibs 
  	@for i in $(DIRS); do \
 -		$(MAKE) -C $$i cmi-install extra-install stub-install; \
 +		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR)/dose2; \
  	done
diff --combined ocamlpkgsrc/Makefile
index d802a62,8ab56ee..3ad614f
--- a/ocamlpkgsrc/Makefile
+++ b/ocamlpkgsrc/Makefile
@@@ -1,14 -1,15 +1,15 @@@
  # Makefile
  
- NAME=				ocamlpkgsrc
- SOURCES=		ocamlpkgsrc.ml
- MLIS=				ocamlpkgsrc.mli
- C_SOURCES=	ocamlpkgsrc_stubs.c
- EXTRA_INSTALL= dllocamlpkgsrc.so libocamlpkgsrc.a
- REQUIRES=		util napkin
- PACKAGES=		pcre
+ NAME=				   ocamlpkgsrc
+ SOURCES=		   ocamlpkgsrc.ml
+ MLIS=				   ocamlpkgsrc.mli
+ C_SOURCES=	   ocamlpkgsrc_stubs.c
+ STUB_INSTALL=  dllocamlpkgsrc.so
+ EXTRA_INSTALL= libocamlpkgsrc.a
+ REQUIRES=		   util napkin
+ PACKAGES=		   pcre
  
  include ../Makefile.config
  include .depend
  
 -CFLAGS+=   -I.. -fPIC
 +override CFLAGS+=   -I.. -fPIC
diff --combined ocamlrpm/Makefile
index 77dc3ae,17bb4b9..a20dca3
--- a/ocamlrpm/Makefile
+++ b/ocamlrpm/Makefile
@@@ -1,13 -1,15 +1,15 @@@
  # Makefile
  
- NAME=      ocamlrpm
- SOURCES=   ocamlrpm.ml
- MLIS=      ocamlrpm.mli
- C_SOURCES= ocamlrpm_stubs.c
- EXTRA_INSTALL=	dllocamlrpm.so libocamlrpm.a
- REQUIRES=	napkin
+ NAME=          ocamlrpm
+ SOURCES=       ocamlrpm.ml
+ MLIS=          ocamlrpm.mli
+ C_SOURCES=     ocamlrpm_stubs.c
+ STUB_INSTALL=  dllocamlrpm.so
+ EXTRA_INSTALL= libocamlrpm.a
+ REQUIRES=	     napkin progress
+ PACKAGES=	     pcre
  
  include ../Makefile.config
  include .depend
  
 -CFLAGS+=	-I.. -fPIC
 +override CFLAGS+=	-I.. -fPIC

-- 
dose2 packaging