[X2Go-Commits] [x2goserver] 01/02: libx2go-server-db-perl/Makefile: make sure our {C, LD}FLAGS are always appended to the user-provided ones.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 49ce163b9006152a98f02a5eee6285dae5b34741
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 16 00:39:27 2018 +0100

    libx2go-server-db-perl/Makefile: make sure our {C,LD}FLAGS are always appended to the user-provided ones.
---
 debian/changelog                | 2 ++
 libx2go-server-db-perl/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43b3a65..213f44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.3):
     - x2goserver/lib/x2gocheckport: remove executable flag. This file is STILL
       not meant to be executed directly.
+    - libx2go-server-db-perl/Makefile: make sure our {C,LD}FLAGS are always
+      appended to the user-provided ones.
   * x2goserver.spec:
     + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around
       a bug.
diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile
index 1cbb1bf..14e37a3 100755
--- a/libx2go-server-db-perl/Makefile
+++ b/libx2go-server-db-perl/Makefile
@@ -4,8 +4,8 @@ SRC_DIR=$(CURDIR)
 SHELL=/bin/bash
 
 CC      ?= gcc
-CFLAGS  += -fPIE
-LDFLAGS += -pie
+override CFLAGS  += -fPIE
+override LDFLAGS += -pie
 
 INSTALL_DIR=install -d -o root -g root -m 755
 INSTALL_FILE=install -o root -g root -m 644

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git