[X2Go-Commits] [x2gokdriveclient] 03/03: debian/rules: let qmake add general Qt {C{, XX}, L}FLAGS instead of overriding them.

[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 x2gokdriveclient.

commit 2e34dfd74818686661bbebd7dff4de1407c0e0ca
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 20 11:26:30 2020 +0100

    debian/rules: let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
    
    Especially needed for C++11 support.
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 738b40c..6e5fed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,5 +9,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       for documentation purposes, since this feature should be enabled by
       default.
     - x2gokdriveclient.pro: whitespace only.
+  * debian/rules:
+    * Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
+      Especially needed for C++11 support.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 11:10:43 +0200
diff --git a/debian/rules b/debian/rules
index 7603c06..6d63344 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ override_dh_auto_configure:
 	dh_auto_configure
 
 override_dh_auto_build:
-	qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2gokdriveclient.pro
+	qmake QMAKE_CFLAGS+="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS+="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS+="${LDFLAGS}" x2gokdriveclient.pro
 
 override_dh_install:
 	mkdir -p $(CURDIR)/debian/x2gokdriveclient/usr/bin/

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