diff options
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/libpam-cracklib.install | 2 | ||||
| -rw-r--r-- | debian/libpam-modules.install | 2 | ||||
| -rw-r--r-- | debian/libpam0g-dev.install | 2 | ||||
| -rw-r--r-- | debian/libpam0g-dev.links.in (renamed from debian/libpam0g-dev.links) | 0 | ||||
| -rw-r--r-- | debian/libpam0g.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
7 files changed, 7 insertions, 5 deletions
diff --git a/debian/clean b/debian/clean index 62f09e76..4a7c5600 100644 --- a/debian/clean +++ b/debian/clean @@ -1 +1,2 @@ debian/local/pam_getenv.8 +debian/libpam0g-dev.links diff --git a/debian/libpam-cracklib.install b/debian/libpam-cracklib.install index eb29160b..55265e5e 100644 --- a/debian/libpam-cracklib.install +++ b/debian/libpam-cracklib.install @@ -1,2 +1,2 @@ -lib/security/pam_cracklib.so +lib/*/security/pam_cracklib.so debian/pam-configs/cracklib usr/share/pam-configs diff --git a/debian/libpam-modules.install b/debian/libpam-modules.install index 348012e8..41b07af7 100644 --- a/debian/libpam-modules.install +++ b/debian/libpam-modules.install @@ -3,4 +3,4 @@ sbin/unix_chkpwd sbin sbin/unix_update sbin sbin/pam_tally sbin sbin/mkhomedir_helper sbin -lib/security/*.so lib/security +lib/*/security/*.so diff --git a/debian/libpam0g-dev.install b/debian/libpam0g-dev.install index c51c0567..d8f5d831 100644 --- a/debian/libpam0g-dev.install +++ b/debian/libpam0g-dev.install @@ -1,2 +1,2 @@ usr/include/security/* -lib/*.a usr/lib +lib/*/*.a usr/lib diff --git a/debian/libpam0g-dev.links b/debian/libpam0g-dev.links.in index f595eeb9..f595eeb9 100644 --- a/debian/libpam0g-dev.links +++ b/debian/libpam0g-dev.links.in diff --git a/debian/libpam0g.install b/debian/libpam0g.install index d9178d41..622f9ef2 100644 --- a/debian/libpam0g.install +++ b/debian/libpam0g.install @@ -1 +1 @@ -lib/lib*.so.* +lib/*/lib*.so.* diff --git a/debian/rules b/debian/rules index e455d66d..cdedbf26 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,7 @@ configure-stamp: cd $(BUILD_TREE) && \ ./configure $(conf_args) \ --sysconfdir=/etc --prefix=/usr --enable-static --enable-shared \ - --libdir=/lib --sbindir=/sbin --disable-audit + --libdir=/lib/$(DEB_HOST_GNU_TYPE) --sbindir=/sbin --disable-audit touch configure-stamp @@ -92,6 +92,7 @@ binary-arch: install dh_install -a -Nlibpam-cracklib -X pam_cracklib dh_install -plibpam-cracklib + sed -e"s,^/lib,/lib/$(DEB_HOST_GNU_TYPE)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links dh_link -a dh_installman -a rm -f $(d)/libpam-modules/usr/share/man/man5/pam.conf.5 |