[emos] 04/09: Remove build dir from cmake files

[Alastair McKinstry]

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

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

commit 1f637310f48ae0446dcbc82e2610c28c9f78ceb7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Sep 14 21:13:59 2016 +0100

    Remove build dir from cmake files
---
 debian/changelog | 2 +-
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12704a1..721e52a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 emoslib (2:4.4.3-1) UNRELEASED; urgency=medium
 
-  * New upstream release.
+  * New upstream release. Closes: #832412.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 06 Sep 2016 08:55:12 +0100
 
diff --git a/debian/rules b/debian/rules
index aa4e6d3..679de17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		-Dgrib_api_BASE_DIR=/usr \
 		-DECBUILD_LOG_LEVEL=DEBUG \
 		-DENABLE_FFTW=ON \
 		-DENABLE_LITTLE_ENDIAN=$(LITTLE) \
@@ -92,7 +93,8 @@ override_dh_auto_install:
 		sed -e 	's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' > ${CMAKE_DIR}/tmp
 	mv ${CMAKE_DIR}/tmp ${CMAKE_DIR}/libemos-targets-release.cmake
 	# Change default from emos to emos_shared to link against shared libs in metview, etc.
-	grep -v LIBEMOS_SELF_LIBRARIES ${CMAKE_DIR}/libemos-config.cmake > ${CMAKE_DIR}/tmp
+	grep -v LIBEMOS_SELF_LIBRARIES ${CMAKE_DIR}/libemos-config.cmake | \
+		sed -e 's%.*set( libemos_BASE_DIR.*$%set( libemos_BASE_DIR /usr )%' > ${CMAKE_DIR}/tmp
 	mv ${CMAKE_DIR}/tmp ${CMAKE_DIR}/libemos-config.cmake  
 	echo >> ${CMAKE_DIR}/libemos-config.cmake 
 	echo "set( LIBEMOS_SELF_LIBRARIES    "emos_shared" )" >> ${CMAKE_DIR}/libemos-config.cmake 

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