diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-02-11 19:02:57 -0500 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-12 10:08:11 +0100 |
| commit | bccb2750bd5e630401e73528f9afb0bb0692f15b (patch) | |
| tree | c3357e37ea958297a3f958dd04a468683bd7dcb4 | |
| parent | 4157e8258b2f9f2d760df5aae1ccfadb5f3eb393 (diff) | |
| download | nx-libs-bccb2750bd5e630401e73528f9afb0bb0692f15b.tar.gz nx-libs-bccb2750bd5e630401e73528f9afb0bb0692f15b.tar.bz2 nx-libs-bccb2750bd5e630401e73528f9afb0bb0692f15b.zip | |
Fix build when LDFLAGS (etc) contains spaces.
Was needed and was tested on Ubuntu 14.04.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index c8d0314b1..a8c2480f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -116,6 +116,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 bdb9e647a..2953882bc 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)" |