[metview] 18/97: Fix -fPIC again

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit c3ea55f535cadc3eeefb384b256275aec8d7b164
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Feb 23 15:12:24 2014 +0000

    Fix -fPIC again
---
 debian/rules | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index cd1b9d5..20efdaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,10 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-format
-DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
-export DEB_BUILD_MAINT_OPTIONS
-export DEB_CFLAGS_MAINT_APPEND
+#DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-format
+#DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
+#export DEB_BUILD_MAINT_OPTIONS
+#export DEB_CFLAGS_MAINT_APPEND
 
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -17,10 +17,20 @@ TOPDIR=:=`pwd`
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_clean:
+	dh_clean
+	rm -f share/metview/icons/make.dep config/CONFIG.site share/metview/app-defaults/MvVersionDetails  \
+		share/metview/etc/ConfigDef include/macro_api.h etc/ConfigDef
+	find . -type l -delete
+
+# magics++ upstream ships with a copy of terralib, which is not used in Debian. Instead we use
+# a shared terralib library, and so need to include terralib.
+# Also -fPIC, for some reason.
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--enable-magics \
-		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " CXXFLAGS=" -fPIC "
+		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git