[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-1-1-g1ba6c00

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 1ba6c00656ced03f343d85ae434aa29ee218a53d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 10 14:12:01 2009 +0200

    Install why library in usr/share since there is no arch dependent file.

diff --git a/debian/changelog b/debian/changelog
index f3be941..9f07472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+why (2.19+dfsg-2) unstable; urgency=low
+
+  * Install why library in usr/share since there is no arch dependent
+    files there.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 10 Sep 2009 14:11:00 +0200
+
 why (2.19+dfsg-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/rules b/debian/rules
index 5881d90..0eadedb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ config.status: configure
 	    --host=$(DEB_HOST_GNU_TYPE) \
 	    --build=$(DEB_BUILD_GNU_TYPE) \
 	    --prefix=/usr \
+	    --libdir=/usr/share \
 	    --mandir=\$${prefix}/share/man \
 	    --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
 	    LDFLAGS="-Wl,-z,defs"
@@ -60,11 +61,11 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	$(MAKE) prefix=$(WHYDIR)/usr install COQLIB=$(CURDIR)/debian/libwhy-coq/$(COQ_STDLIB_DIR)
-	#-rm -f $(WHYDIR)/usr/lib/coq/jessie_why.v
-	#Used to remove jessie_why.v which is alone in /usr/lib/coq/
-	-$(RM) -rf $(WHYDIR)/usr/lib/coq/
-	mv $(WHYDIR)/usr/lib/why/why-logo-1.png $(WHYDIR)/usr/share/why
+	$(MAKE) prefix=$(WHYDIR)/usr install \
+		LIBDIR=$(WHYDIR)/usr/share   \
+		COQLIB=$(CURDIR)/debian/libwhy-coq/$(COQ_STDLIB_DIR)
+	#Used to remove /usr/share/coq/jessie_why.v which is alone and installed by libwhy-coq
+	-$(RM) -rf $(WHYDIR)/usr/share/coq/
 	echo 'F:OCamlRuntime=$(OCAML_RUNTIME_NOX)' >> debian/libjessie-ocaml-dev.substvars
 	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libwhy-coq.substvars
 ifeq ($(OCAML_OPT_ARCH),)

-- 
why packaging