Make CFLAGS usable in x2goserver. (Fixes: #83).

diff --git a/debian/changelog b/debian/changelog
index 08885e5ac43e8042f026d34a45bebff3aaec3926..6d58d10b2111e933fe7afceb455e373646bc9d72 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low
+
+  [ Bernard Cafarelli ]
+  * New upstream version (4.0.0.1):
+    - Make CFLAGS usable in x2goserver. (Fixes: #83).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 11 Feb 2013 11:42:32 +0100
+
 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]

diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 43fdccf9908eaf17f9451017efb3844e67b1562b..4287478482ad84e2348743f330bd690cc53ada9b 100755 (executable)
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -3,6 +3,10 @@
 SRC_DIR=$(CURDIR)
 SHELL=/bin/bash
 
+CC      ?= gcc
+CFLAGS  += -fPIE
+LDFLAGS += -pie
+
 INSTALL_DIR=install -d -o root -g root -m 755
 INSTALL_FILE=install -o root -g root -m 644
 INSTALL_PROGRAM=install -o root -g root -m 755
@@ -37,7 +41,7 @@ build: build-arch build-indep
 build-arch: build_setgidwrappers
 
 build_setgidwrappers:
-       gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
 
 build-indep: build_man2html