The following commit has been merged in the master branch:
commit e385d52b6f49e7b50e9ef099169746fa4f3ef90f
Author: Jérémy Lal <kapo...@melix.org>
Date:   Thu Aug 29 00:12:11 2013 +0200

    Harden build

diff --git a/debian/rules b/debian/rules
index db419e1..3329e19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,12 +15,15 @@ REVISION := $(shell echo $(CURVER) | awk -F'svn' '{print 
$$2}')
 SVNREPO := https://monav.googlecode.com/svn/trunk/
 endif
 
+cxxflags := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags 
--get CPPFLAGS)
+ldflags := $(shell dpkg-buildflags --get LDFLAGS)
+
 configure:
-       qmake QMAKE_CXXFLAGS_RELEASE+=-g monavclient.pro -o Makefile.client
-       qmake CONFIG+=nogui QMAKE_CXXFLAGS_RELEASE+=-g monavpreprocessor.pro -o 
Makefile.preprocessor
-       qmake QMAKE_CXXFLAGS_RELEASE+=-g monavpreprocessor-gui.pro -o 
Makefile.preprocessor-gui
-       qmake CONFIG+=nogui QMAKE_CXXFLAGS_RELEASE+=-g monavroutingdaemon.pro 
-o Makefile.routingdaemon
-       qmake CONFIG+=nogui QMAKE_CXXFLAGS_RELEASE+=-g 
tools/monav-packager/monav-packager.pro -o Makefile.monav-packager
+       qmake QMAKE_CXXFLAGS_RELEASE+="$(cxxflags)" 
QMAKE_LFLAGS_RELEASE+="$(ldflags)" monavclient.pro -o Makefile.client
+       qmake QMAKE_CXXFLAGS_RELEASE+="$(cxxflags)" 
QMAKE_LFLAGS_RELEASE+="$(ldflags)" CONFIG+=nogui monavpreprocessor.pro -o 
Makefile.preprocessor
+       qmake QMAKE_CXXFLAGS_RELEASE+="$(cxxflags)" 
QMAKE_LFLAGS_RELEASE+="$(ldflags)" monavpreprocessor-gui.pro -o 
Makefile.preprocessor-gui
+       qmake QMAKE_CXXFLAGS_RELEASE+="$(cxxflags)" 
QMAKE_LFLAGS_RELEASE+="$(ldflags)" CONFIG+=nogui monavroutingdaemon.pro -o 
Makefile.routingdaemon
+       qmake QMAKE_CXXFLAGS_RELEASE+="$(cxxflags)" 
QMAKE_LFLAGS_RELEASE+="$(ldflags)" CONFIG+=nogui 
tools/monav-packager/monav-packager.pro -o Makefile.monav-packager
 
 override_dh_auto_configure: configure
 

-- 
fast navigation system featuring exact routing

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to