[X2Go-Commits] [nx-libs] 02/05: Use proper quoting on build flag vars (they may contain spaces).

git-admin at x2go.org git-admin at x2go.org
Sat Feb 14 17:47:27 CET 2015


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

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

commit 8c98a401b49506f969dc9263d9bd566e5b31a572
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 14 14:23:10 2015 +0100

    Use proper quoting on build flag vars (they may contain spaces).
    
    Conflicts (resolved by Mike Gabriel after cherry-pick from 3.6.x branch):
    	debian/rules
---
 debian/changelog |    1 +
 debian/rules     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a8c2480..6ce69db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     + Add to B-D: expat.
     + Install upstream ChangeLogs into bin:packages.
     + Remove upstream nx-libs ChangeLog during override_dh_clean.
+    + Use proper quoting on build flag vars (they may contain spaces).
 
   * nx-libs.spec:
     + The gpg-offline bin:package is not available in our SLE repo. We can do
diff --git a/debian/rules b/debian/rules
index bdb9e64..6a82c67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,7 +140,7 @@ override_dh_auto_build:
 	cp -av .preserve/* .
 	rm -Rf .preserve/
 
-	LOCAL_LDFLAGS=$(LDFLAGS) SHLIBGLOBALSFLAGS=$(LDFLAGS) SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel
+	LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel
 
 override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list