From abdb65842a37ad24fe57943227b8aaf876acc9f9 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 7 Dec 2013 09:06:45 +0000
Subject: [PATCH] install pam library in the right arch-specific dir
---
debian/control | 2 +-
debian/libpam-authclient.install | 2 +-
debian/rules | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 65a836d..f3c48d7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Autistici/Inventati <debian@autistici.org>
Build-Depends: debhelper (>= 8.0.0), build-essential,
python (>= 2.6.6-3~), python-setuptools, autoconf, automake, libtool,
- libcurl4-openssl-dev, libpam0g-dev
+ libcurl4-openssl-dev | libcurl4-gnutls-dev, libpam0g-dev
Standards-Version: 3.9.4
Package: libpam-authclient
diff --git a/debian/libpam-authclient.install b/debian/libpam-authclient.install
index a25fff4..c8053e9 100644
--- a/debian/libpam-authclient.install
+++ b/debian/libpam-authclient.install
@@ -1,3 +1,3 @@
-debian/tmp/lib/security/pam_authclient.so*
+debian/tmp/lib/*/security
debian/tmp/usr/include/authclient
debian/tmp/usr/lib/libauthclient.so*
diff --git a/debian/rules b/debian/rules
index 0aacc2b..08124da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,19 +18,20 @@ export DH_OPTIONS
export PYBUILD_NAME=authserv
+PAM_INST_DIR = $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security
%:
dh $@ --with python2 --buildsystem=python_distutils
override_dh_auto_build:
- (cd pam && ./autogen.sh && ./configure --prefix=/usr && make)
+ (cd pam && ./autogen.sh && ./configure --prefix=/usr --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security && make)
dh_auto_build
override_dh_install:
(cd pam && make install DESTDIR=$(CURDIR)/debian/tmp)
- rm -f $(CURDIR)/debian/tmp/lib/security/pam_authclient.so{,.0}
- mv $(CURDIR)/debian/tmp/lib/security/pam_authclient.so.0.0.0 \
- $(CURDIR)/debian/tmp/lib/security/pam_authclient.so
+ rm -f $(PAM_INST_DIR)/pam_authclient.so{,.0}
+ mv $(PAM_INST_DIR)/pam_authclient.so.0.0.0 \
+ $(PAM_INST_DIR)/pam_authclient.so
dh_auto_install
dh_install
--
GitLab