[magics] 51/63: debian/rules: now need to specify geotiff location

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 3b85a08021997d50c7c4bbd9244471a56140ea24
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Nov 30 12:18:01 2016 +0000

    debian/rules: now need to specify geotiff location
---
 debian/changelog | 1 +
 debian/rules     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 79a0aec..264c39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ magics++ (2.30.0-1) unstable; urgency=medium
   * Build-dep against eccodes not grib-api
   * Split dh_fixperms-arch for FTBFS on dpkg-buildpackage -A.
     Closes: #846092
+  * debian/rules: now need to specify geotiff location
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 28 Nov 2016 15:18:58 +0000
 
diff --git a/debian/rules b/debian/rules
index daca378..d460239 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ export extra_flags +=  \
 	-DBUILD_SHARED_LIBS=ON \
 	-DENABLE_TESTS=ON \
 	-DENABLE_GEOTIFF=ON \
+	-DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff \
 	-DENABLE_RPATHS=OFF \
 	-DENABLE_CAIRO=ON \
 	-DENABLE_BUFR=ON \
@@ -75,7 +76,7 @@ export extra_flags +=  \
 	-DENABLE_METVIEW=ON \
 	-DENABLE_QT5=ON \
 	-DENABLE_NETCDF=ON \
-	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel -I/usr/include/geotiff' \
+	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel' \
 	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd -lemosR64' 
 
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)

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