[SCM] zita-resampler/master: Use a custom LIBDIR for a Multiarch compliant installation of the shared objects.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a9e11f8cc442aa55c23aee19ac4367683a52c59d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 28 20:11:31 2012 +0100

    Use a custom LIBDIR for a Multiarch compliant installation of the shared objects.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index d4fabb8..f1b047f 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -6,14 +6,12 @@ Description: Set PREFIX properly.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- apps/Makefile |   10 +++++-----
- libs/Makefile |   16 ++++++++--------
- 2 files changed, 13 insertions(+), 13 deletions(-)
+ apps/Makefile |   12 ++++++------
+ libs/Makefile |    6 +++---
+ 2 files changed, 9 insertions(+), 9 deletions(-)
 
-Index: zita-resampler/apps/Makefile
-===================================================================
---- zita-resampler.orig/apps/Makefile	2012-01-28 19:16:08.000000000 +0100
-+++ zita-resampler/apps/Makefile	2012-01-28 19:27:30.944222543 +0100
+--- zita-resampler.orig/apps/Makefile
++++ zita-resampler/apps/Makefile
 @@ -18,16 +18,16 @@
  # ----------------------------------------------------------------------------
  
@@ -22,7 +20,7 @@ Index: zita-resampler/apps/Makefile
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 -LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
++LIBDIR := lib
  DISTDIR = zresample-$(VERSION)
  VERSION = 0.4.0
  MANDIR = /usr/share/man/man1
@@ -36,7 +34,7 @@ Index: zita-resampler/apps/Makefile
  
  
  all:	zresample zresample.1.gz
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ zresample.1.gz:	zresample.1
  
  
  install:	all
@@ -45,10 +43,8 @@ Index: zita-resampler/apps/Makefile
  	install -Dm 644 zresample.1.gz $(DESTDIR)$(MANDIR)/zresample.1.gz
  
  uninstall: 
-Index: zita-resampler/libs/Makefile
-===================================================================
---- zita-resampler.orig/libs/Makefile	2012-01-28 19:16:08.000000000 +0100
-+++ zita-resampler/libs/Makefile	2012-01-28 19:28:27.912505029 +0100
+--- zita-resampler.orig/libs/Makefile
++++ zita-resampler/libs/Makefile
 @@ -20,9 +20,9 @@
  
  # Modify as required.
@@ -57,11 +53,11 @@ Index: zita-resampler/libs/Makefile
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 -LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
++LIBDIR := lib
  
  MAJVERS = 1
  MINVERS = 1.0
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ install:	$(ZITA-RESAMPLER_MIN)
  	install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(PREFIX)/include/zita-resampler
  	install -m 644 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
  	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO)
diff --git a/debian/rules b/debian/rules
index efbcfc6..5690c17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@ -Smakefile -Dlibs
 

-- 
zita-resampler packaging