[SCM] gmerlin-avdecoder/master: Fix multiarch stuff.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8d9465536b6164bd7be9bdb117604b5e533571be
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 19:08:57 2012 +0200

    Fix multiarch stuff.
    
    Git-Dch: Ignore

diff --git a/debian/libgmerlin-avdec1.install b/debian/libgmerlin-avdec1.install
index e76db45..11718c3 100644
--- a/debian/libgmerlin-avdec1.install
+++ b/debian/libgmerlin-avdec1.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/*/libgmerlin_avdec.so.1*
+debian/tmp/usr/lib/*/libgmerlin_avdec.so.*
 debian/tmp/usr/share/locale
diff --git a/debian/rules b/debian/rules
index 729acf4..186355e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,8 @@ DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./lib/os_inet_aton.c
 
 DEB_UPSTREAM_TARBALL_MD5 = c1ea663e9da631453eec4ac79138b6c5
 
-DEB_CONFIGURE_EXTRA_FLAGS := --docdir=\$${prefix}/share/doc/libgmerlin-avdec-doc
+DEB_CONFIGURE_EXTRA_FLAGS := --docdir=\$${prefix}/share/doc/libgmerlin-avdec-doc \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
 
 # bootstrap autotools files (CDBS normally only updates them)

-- 
gmerlin-avdecoder packaging