This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch debian/unstable
in repository htslib.

commit 22fef0c35477a45ddfdd9e19ba270c76f094f211
Author: Charles Plessy <[email protected]>
Date:   Sat Aug 16 20:17:38 2014 +0900

    Pass multiarch path to Make.  Install pkgconfig file.
---
 debian/libhts-dev.install | 9 +++++----
 debian/libhts1.install    | 2 +-
 debian/rules              | 9 +++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/libhts-dev.install b/debian/libhts-dev.install
index fcf5206..87e7d23 100755
--- a/debian/libhts-dev.install
+++ b/debian/libhts-dev.install
@@ -1,5 +1,6 @@
 #! /usr/bin/dh-exec
-usr/include/*          usr/include/
-usr/lib/*.a            usr/lib/${DEB_HOST_MULTIARCH}/
-usr/lib/*.so           usr/lib/${DEB_HOST_MULTIARCH}/
-usr/share/man/man5/*   usr/share/man/man5/
+usr/include/*                          usr/include
+usr/lib/${DEB_HOST_MULTIARCH}/*.a      usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/*.so     usr/lib/${DEB_HOST_MULTIARCH}
+usr/share/man/man5/*                   usr/share/man/man5
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/htslib.pc 
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libhts1.install b/debian/libhts1.install
index e6cb81d..659d59c 100755
--- a/debian/libhts1.install
+++ b/debian/libhts1.install
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-usr/lib/libhts.so.*    usr/lib/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/libhts.so.*      usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index e1f171b..0295105 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,12 @@ override_dh_auto_build:
          CFLAGS="$$(dpkg-buildflags --get CFLAGS)" \
          CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \
          LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \
-         PACKAGE_VERSION="$(DEB_VERSION)"
+         PACKAGE_VERSION="$(DEB_VERSION)" \
+         libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
-       dh_auto_install -- prefix=/usr PACKAGE_VERSION="$(DEB_VERSION)"
+       rm $(CURDIR)/test/sam
+       dh_auto_install -- \
+         prefix=/usr \
+         libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+         PACKAGE_VERSION="$(DEB_VERSION)"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/htslib.git

_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to