[SCM] alsaequal/master: Install into multiarch directories. Closes: #635005

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 621f96d7b6262bddd475304405534317b82b362b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 28 07:49:42 2011 +0200

    Install into multiarch directories. Closes: #635005

diff --git a/debian/libasound2-plugin-equal.dirs b/debian/libasound2-plugin-equal.dirs
deleted file mode 100644
index b7ec8e3..0000000
--- a/debian/libasound2-plugin-equal.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/alsa-lib
diff --git a/debian/patches/0003-multiarch-dirs.patch b/debian/patches/0003-multiarch-dirs.patch
new file mode 100644
index 0000000..68b86b3
--- /dev/null
+++ b/debian/patches/0003-multiarch-dirs.patch
@@ -0,0 +1,27 @@
+Description: Allow to override installation dir
+Author: Reinhard Tartler <siretart at tauware.de>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635005
+
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,8 @@ SND_CTL_OBJECTS = ctl_equal.o ladspa_uti
+ SND_CTL_LIBS =
+ SND_CTL_BIN = libasound_module_ctl_equal.so
+ 
++LIBDIR = lib
++
+ .PHONY: all clean dep load_default
+ 
+ all: Makefile $(SND_PCM_BIN) $(SND_CTL_BIN)
+@@ -45,8 +47,9 @@ clean:
+ 
+ install: all
+ 	@echo Installing...
+-	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
+-	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
++	$(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+ 
+ uninstall:
+ 	@echo Un-installing...
diff --git a/debian/patches/series b/debian/patches/series
index 79956b0..790ab9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-remove-ladspa-sdk.patch
+0003-multiarch-dirs.patch
diff --git a/debian/rules b/debian/rules
index a53ba32..2b566a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_clean:
 	dh_clean -XMakefile~
+
+override_dh_auto_install:
+	make install LIBDIR=$(LIBDIR) DESTDIR=debian/libasound2-plugin-equal

-- 
alsaequal packaging