[Pkg-ocaml-maint-commits] r1961 - trunk/packages/ocaml-gettext/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 16:15:25 +0000 (Wed, 09 Nov 2005)
New Revision: 1961

Removed:
   trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs
Modified:
   trunk/packages/ocaml-gettext/trunk/debian/changelog
   trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs
   trunk/packages/ocaml-gettext/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Modified: trunk/packages/ocaml-gettext/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/changelog	2005-11-09 16:05:06 UTC (rev 1960)
+++ trunk/packages/ocaml-gettext/trunk/debian/changelog	2005-11-09 16:15:25 UTC (rev 1961)
@@ -1,3 +1,9 @@
+ocaml-gettext (0.2.0-3) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 17:05:53 +0100
+
 ocaml-gettext (0.2.0-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs	2005-11-09 16:05:06 UTC (rev 1960)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs	2005-11-09 16:15:25 UTC (rev 1961)
@@ -1,3 +1,2 @@
-usr/lib/ocaml/3.08.3
 usr/bin
 usr/share/doc/libgettext-ocaml-dev/html

Deleted: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs
===================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs	2005-11-09 16:05:06 UTC (rev 1960)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs	2005-11-09 16:15:25 UTC (rev 1961)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3/stublibs

Modified: trunk/packages/ocaml-gettext/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/rules	2005-11-09 16:05:06 UTC (rev 1960)
+++ trunk/packages/ocaml-gettext/trunk/debian/rules	2005-11-09 16:15:25 UTC (rev 1961)
@@ -1,48 +1,45 @@
 #!/usr/bin/make -f
 
-OCAML_LIBDIR=`ocamlc -where`
+OCAMLIBDIR=`ocamlc -where`
+DESTDIR=$(CURDIR)/debian/libgettext-ocaml
+DESTDIR_DEV=$(CURDIR)/debian/libgettext-ocaml-dev
+DESTDIR_DATA=$(CURDIR)/debian/libgettext-ocaml-data
 
 include /usr/share/dpatch/dpatch.make 
 
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
-	./configure --prefix=$(CURDIR)/debian/libgettext-ocaml-dev/usr \
-	 --with-docdir=$(CURDIR)/debian/libgettext-ocaml-data/usr/share/doc/libgettext-ocaml-data/ \
-	 --libdir=$(CURDIR)/debian/libgettext-ocaml-dev/$(OCAML_LIBDIR) \
-	 --mandir=$(CURDIR)/debian/libgettext-ocaml-dev/usr/share/man
-	touch $@
+	./configure --prefix=$(DESTDIR_DEV)/usr \
+	 --with-docdir=$(DESTDIR_DATA)/usr/share/doc/libgettext-ocaml-data/ \
+	 --libdir=$(DESTDIR_DEV)/$(OCAMLIBDIR) \
+	 --mandir=$(DESTDIR_DEV)/usr/share/man
+	touch configure-stamp
 
-build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
+build: configure-stamp build-stamp
+build-stamp:
 	dh_testdir
-	$(MAKE) all
-	touch build-arch-stamp
+	env LC_ALL=C $(MAKE) all
+	touch build-stamp
 
-build-indep: config.status  build-indep-stamp
-build-indep-stamp: 
-	dh_testdir
-	touch build-indep-stamp
-
-build: build-arch build-indep
-
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-$(RM) build-arch-stamp build-indep-stamp configure-stamp
+	-$(RM) build-stamp configure-stamp
 	-$(MAKE) distclean
 	dh_clean
 
-install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	make install LDCONF=ignore PODIR=$(CURDIR)/debian/libgettext-ocaml-data/usr/share/locale/
-	mv $(CURDIR)/debian/libgettext-ocaml-dev/$(OCAML_LIBDIR)/gettext-stub/*.so \
-	 $(CURDIR)/debian/libgettext-ocaml/$(OCAML_LIBDIR)/stublibs/
-	chrpath -d $(CURDIR)/debian/libgettext-ocaml/$(OCAML_LIBDIR)/stublibs/*.so
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
+	make install LDCONF=ignore PODIR=$(DESTDIR_DATA)/usr/share/locale/
+	mv $(DESTDIR_DEV)/$(OCAMLIBDIR)/gettext-stub/*.so \
+	 $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
+	chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
 
 binary-indep: build install
 	dh_testdir -i