[SCM] libav-extra/master: Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184).

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 92a8343c815cf835dac5f8b31a491dec11309c40
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Jan 17 10:34:34 2012 +0100

    Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184).
    
    (cherry picked from commit fc35acc36968c21f0472e3800d697b288290d86d)
    
    Conflicts:
    	debian/rules

diff --git a/debian/rules b/debian/rules
index 5ef0122..e80e02d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ endif
 endif
 
 include debian/confflags
-OPT_FLAVOR := $(filter-out static shared, $(FLAVORS))
+OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
 
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
@@ -34,13 +34,16 @@ $(info BUILT_USING = $(BUILT_USING))
 libav/configure:
 	tar xvf /usr/src/libav-source.tar.gz
 
+define dh_install_file_opt_flavor
+	  grep @DEB_HOST_MULTIARCH_OPT@ < $(1).in | \
+	  sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(2)_shlibdir):g' >> $(1)
+
+endef
+
 DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS), debian/$(pkg).install)
 $(DH_INSTALL_FILES):
 	sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
-ifneq (,$(OPT_FLAVOR))
-	grep @DEB_HOST_MULTIARCH_OPT@ < $@.in | \
-	sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(OPT_FLAVOR)_shlibdir):g' >> $@
-endif
+	$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
 
 configure-%: configure-stamp-%
 configure-stamp-%: libav/configure

-- 
libav-extra packaging