Pass a multiarch --libdir to ./configure.

Closes: #871412

diff --git a/debian/changelog b/debian/changelog
index 566c1355f3a73819d5498d29f6b4524c71cfb502..d849c38bacee5f028efab447374c539532518744 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 libmpdclient (2.11-1) UNRELEASED; urgency=medium
 
 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.
   * 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 41dce49a50ce5da14d4dddf98f7331480de9272e..ee8af13e927e9c39fb35f020a6fefc565ed4bec2 100644 (file)
--- a/debian/libmpdclient-dev.install
+++ b/debian/libmpdclient-dev.install
@@ -1,6 +1,6 @@
 usr/include/*
 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
 
 usr/share/vala/vapi/libmpdclient.vapi
 

diff --git a/debian/libmpdclient2.install b/debian/libmpdclient2.install
index 5e9c55d1ddb4c0ac048c112f4a48d963a3925adb..f6ad68920bcd3bfcbb4393754877932bdd23f3f9 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 efa37f06387a75cade4f161412e87f3df3f2959b..63702e50a81fbc5d92cc7b959acaced880dccfdb 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)
 
 # 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)
 
 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 \
                        --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
                        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
        $(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
        
        # these files do not include any useful content
        rm -f debian/tmp/usr/share/doc/libmpdclient/README