Pass a multiarch --libdir to ./configure.

Closes: #871412

diff --git a/debian/changelog b/debian/changelog
index 566c135..d849c38 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 libmpdclient (2.11-1) UNRELEASED; urgency=medium
 
+  [ Helmut Grohne ]
+  * Pass a multiarch --libdir to ./configure (Closes: #871412).
+
+  [ Sebastian Harl ]
   * New upstream version.
   * Update standards version to 4.1.1:
     - Update to debhelper compat version 10.

diff --git a/debian/libmpdclient-dev.install b/debian/libmpdclient-dev.install
index 41dce49..ee8af13 100644 (file)
--- a/debian/libmpdclient-dev.install
+++ b/debian/libmpdclient-dev.install
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/vala/vapi/libmpdclient.vapi
 

diff --git a/debian/libmpdclient2.install b/debian/libmpdclient2.install
index 5e9c55d..f6ad689 100644 (file)
--- a/debian/libmpdclient2.install
+++ b/debian/libmpdclient2.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
 

diff --git a/debian/rules b/debian/rules
index efa37f0..63702e5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
@@ -36,6 +35,7 @@ config.status: configure
                        --build=$(DEB_BUILD_GNU_TYPE) \
                        --prefix=/usr \
                        --mandir=\$${prefix}/share/man \
+                       --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
                        CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
 
 build: build-arch build-indep
@@ -70,7 +70,7 @@ install: build
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        
        # we do not want .la files in Debian
-       rm -f debian/tmp/usr/lib/libmpdclient.la
+       rm -f debian/tmp/usr/lib/*/libmpdclient.la
        
        # these files do not include any useful content
        rm -f debian/tmp/usr/share/doc/libmpdclient/README