[X2Go-Commits] [nx-libs] 01/01: Fix build when LDFLAGS (etc) contains spaces.

git-admin at x2go.org git-admin at x2go.org
Thu Feb 12 10:07:46 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 2b06c8a333544d9494473db883c055a0e53cc003
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Wed Feb 11 19:02:57 2015 -0500

    Fix build when LDFLAGS (etc) contains spaces.
    
    Was needed and was tested on Ubuntu 14.04.
---
 debian/changelog |    4 ++++
 debian/rules     |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fba89b2..ecbe901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,6 +113,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file.
     (Fixes: #744).
 
+  [ Michael DePaulo ]
+  * debian/rules:
+    + Fix build for LDFLAGS containing spaces.
+
   [ Mihai Moldovan ]
   * Change string "X2go" to "X2Go" where appropriate.
 
diff --git a/debian/rules b/debian/rules
index 099050b..d311837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,10 @@
 
 NULL =
 
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS --export=cmdline)
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS --export=cmdline)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS --export=cmdline)
+export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS --export=cmdline)
 
 export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"
 export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"

--
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