[X2Go-Commits] [nx-libs] 01/01: debian/rules: more Jessie unbreaking, also for dh_auto_{build, install}.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 942ae190ef03c241b9c82830597d1c2bbe361035
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 17 01:05:05 2018 +0200

    debian/rules: more Jessie unbreaking, also for dh_auto_{build,install}.
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index ccd5f88..d0ce74d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,11 +47,13 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_auto_install:
-	PREFIX=/usr dh_auto_install --no-parallel -Smakefile
+	PREFIX='/usr' dh_auto_install --no-parallel -Smakefile || \
+	PREFIX='/usr' dh_auto_install -Smakefile
 
 override_dh_auto_build:
 	debian/compat.sh
-	PREFIX=/usr dh_auto_build --no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))'
+	PREFIX='/usr' dh_auto_build --no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' || \
+	PREFIX='/usr' dh_auto_build -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))'
 
 override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git