diff options
| author | Steve Langasek <vorlon@debian.org> | 2011-06-21 01:18:30 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:52:00 -0800 |
| commit | 1872ca626d0c76cdc947e5802a62603a04eb076d (patch) | |
| tree | 4fc62425b38e65351909fe67246fe9fce851a998 /debian/rules | |
| parent | 736a8c9f5b470e07a8bfe161de2593b2fe42cbaf (diff) | |
| download | pam-1872ca626d0c76cdc947e5802a62603a04eb076d.tar.gz pam-1872ca626d0c76cdc947e5802a62603a04eb076d.tar.bz2 pam-1872ca626d0c76cdc947e5802a62603a04eb076d.zip | |
Pull in final multiarch support from Ubuntu:
- bump the debhelper build-dep
- add Pre-Depends: ${misc:Pre-Depends} for multiarch-support
- add Pre-Depends: libpam0g (>= 1.1.3-2) to libpam-modules
- bump the version in libpam-modules-bin's replaces: of libpam-modules
- use DEB_HOST_MULTIARCH, not DEB_HOST_GNU_TYPE
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index 98539256..774e4b72 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ else CFLAGS += -O0 endif -DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) LC_COLLATE=C export LC_COLLATE @@ -24,7 +24,7 @@ dl = $(d)/local override_dh_auto_configure: dh_auto_configure -- --enable-static --enable-shared \ - --libdir=/lib/$(DEB_HOST_GNU_TYPE) --sbindir=/sbin \ + --libdir=/lib/$(DEB_HOST_MULTIARCH) --sbindir=/sbin \ --enable-isadir=/lib/security --disable-audit \ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -51,7 +51,7 @@ override_dh_installman: # dh_link doesn't do wildcards, so we can't auto-link to the right per-arch # directory override_dh_link: - sed -e"s,^/lib,/lib/$(DEB_HOST_GNU_TYPE)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links + sed -e"s,^/lib,/lib/$(DEB_HOST_MULTIARCH)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links dh_link # using perms that differ from upstream (sgid instead of suid) /and/ that |