Commit bccb2750 authored by Mike DePaulo's avatar Mike DePaulo Committed by Mike Gabriel

Fix build when LDFLAGS (etc) contains spaces.

Was needed and was tested on Ubuntu 14.04.
parent 4157e825
......@@ -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.
......
......@@ -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)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment