diff options
author | Sam Hartman <hartmans@debian.org> | 2024-01-15 16:04:50 -0700 |
---|---|---|
committer | Sam Hartman <hartmans@debian.org> | 2024-01-15 16:04:50 -0700 |
commit | a51be9d1164d6085fae716097f1977400a290c6e (patch) | |
tree | 178a4e8d1cc204f4e4922b28c87670f7619fcc93 /debian/rules | |
parent | de23289da225a424db0a8659fd778cf9ebb14548 (diff) | |
parent | 9f629f45bb64a95958af24ae1a3ebe94530e1cc3 (diff) | |
download | pam-a51be9d1164d6085fae716097f1977400a290c6e.tar.gz pam-a51be9d1164d6085fae716097f1977400a290c6e.tar.bz2 pam-a51be9d1164d6085fae716097f1977400a290c6e.zip |
Merge in usrmerge dep17M2 changes
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index d8d809b5..9e2562b9 100755 --- a/debian/rules +++ b/debian/rules @@ -28,9 +28,11 @@ endif CONFIGURE_OPTS += --enable-logind override_dh_auto_configure: + # Explicitly set libdir, sbindir to avoid upstream's override logic. dh_auto_configure -- --enable-static --enable-shared \ - --libdir=/lib/$(DEB_HOST_MULTIARCH) \ - --enable-isadir=/lib/security \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --sbindir=/usr/sbin \ + --enable-isadir=/usr/lib/security \ --with-systemdunitdir=/usr/lib/systemd/system \ --disable-nis \ --enable-usergroups \ @@ -68,8 +70,8 @@ override_dh_installman: override_dh_fixperms: dh_fixperms ifneq (,$(findstring libpam-modules, $(shell dh_listpackages))) - chgrp shadow $(d)/libpam-modules-bin/sbin/unix_chkpwd - chmod 02755 $(d)/libpam-modules-bin/sbin/unix_chkpwd + chgrp shadow $(d)/libpam-modules-bin/usr/sbin/unix_chkpwd + chmod 02755 $(d)/libpam-modules-bin/usr/sbin/unix_chkpwd endif override_dh_installchangelogs: |