[SCM] kwallet-pam packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.0-0ubuntu1-4-gb8605d2

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwallet-pam.git;a=commitdiff;h=b8605d2

The following commit has been merged in the kubuntu_unstable branch:
commit b8605d2e1eced05ca7002a5b4eca50f62bcbb2da
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Sep 1 10:37:15 2015 +0200

    upstream now honors prefix so set prefix to /
    
    this ensures the modules get installed to the right path. I also suggested
    that there should be a cmake option to define the full path of the pam
    install location but for the time being simply setting the prefix to
    / rather than /usr will serve us nicely as well
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 404230b..a0a10ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,11 @@ override_dh_auto_clean:
 	rm -rf $(QT4_BUILD_DIR)
 
 override_dh_auto_configure:
-	dh_auto_configure
-	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- -DKWALLET4=1
+	dh_auto_configure -- \
+		-DCMAKE_INSTALL_PREFIX=/
+	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- \
+		-DCMAKE_INSTALL_PREFIX=/ \
+		-DKWALLET4=1
 
 override_dh_auto_build:
 	dh_auto_build

-- 
kwallet-pam packaging