From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 3 May 2010 02:56:11 +0000 (-0400)
Subject: Don’t rely on non-matching wildcards in lib32nss-nonlocal.install.
X-Git-Tag: debian/1.11-0debathena1~4
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/516d0b5d5ec42b230be3f6d10acdd39aa1220f34

Don’t rely on non-matching wildcards in lib32nss-nonlocal.install.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---

diff --git a/debian/lib32nss-nonlocal.install b/debian/lib32nss-nonlocal.install
deleted file mode 100644
index 752ce56..0000000
--- a/debian/lib32nss-nonlocal.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib32/*
-emul/ia32-linux/lib/*
diff --git a/debian/rules b/debian/rules
index d41058c..7772ac4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,10 @@ configure/lib32nss-nonlocal:: CC += -m32
 # i386_slibdir in eglibc/debian/sysdeps/amd64.mk
 ifeq ($(or $(IS_UBUNTU), $(call libc6_ge, 2.9-14~)), y)
 configure/lib32nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib32"
+binary-install/lib32nss-nonlocal:: DEB_DH_INSTALL_ARGS = 'lib32/*'
 else
 configure/lib32nss-nonlocal:: DEB_CONFIGURE_PREFIX = /emul/ia32-linux
+binary-install/lib32nss-nonlocal:: DEB_DH_INSTALL_ARGS = 'emul/ia32-linux/lib/*'
 endif
 
 DEB_BUILDDIR_lib64nss-nonlocal = debian/build_64