[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-26-g2ed1f8f

[Ralf Treinen]

The following commit has been merged in the experimental/master branch:
commit a63c44f097c82eefc59d4b5090d04f26404bd7a8
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Tue Apr 9 10:58:57 2013 +0200

    drop the dh_auto_install overwrite. Fix the libdir flag in configure target

diff --git a/debian/changelog b/debian/changelog
index 3da683e..3066317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
   * simplify debian/rules:
      - dh_auto-build: don't call "make altgr-ergo.$(OCAML_BEST)" sicne this
        is now subsumed by "make all"
-     - dh_auto_install: only call "make install" since this subsumes the
-       other targets
+     - drop the dh_install override since upstream's Makefile does the
+       right thing
+  * debian/rules configure target: remove the "alt_ergo" from the libdir flag
+    as this is added in upstream's Makefile.
   * Drop creation of the META file by debian/rules as this is now done by
     upstream's Makefile.
   * Added myself as uploader.
diff --git a/debian/rules b/debian/rules
index d2101c9..cf28c2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_configure:
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE)           \
 	--prefix=/usr                           \
-	--libdir=$(OCAML_STDLIB_DIR)/alt-ergo   \
+	--libdir=$(OCAML_STDLIB_DIR)            \
 	--mandir=\$${prefix}/share/man
 
 override_dh_auto_build:
@@ -31,12 +31,5 @@ override_dh_auto_clean:
 		[ ! -f $$i.debian ] || mv $$i.debian $$i; \
 	done
 
-override_dh_auto_install:
-	$(MAKE) BINDIR=$(CURDIR)/debian/alt-ergo/usr/bin \
-		LIBDIR=$(CURDIR)/debian/alt-ergo/$(OCAML_STDLIB_DIR)/alt-ergo \
-		MANDIR=$(CURDIR)/debian/alt-ergo/usr/share/man \
-		prefix=$(CURDIR)/debian/alt-ergo/usr \
-		install
-
 %:
 	dh --with ocaml $@

-- 
alt-ergo packaging