[metview] 83/97: Hand-specify BUILDDIR

[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 e046445a8774715bb7f37827ebe25832651b11a1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 23 10:24:21 2015 +0100

    Hand-specify BUILDDIR
---
 debian/CONFIG.site.in | 4 ++--
 debian/rules          | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/CONFIG.site.in b/debian/CONFIG.site.in
index 0a5ad2e..90d8d5a 100644
--- a/debian/CONFIG.site.in
+++ b/debian/CONFIG.site.in
@@ -13,8 +13,8 @@ METVIEW_SCRIPT=metview
 MV_MARS_ACCESS=MARS_webapi
 METVIEW_BIN=/usr/lib/@ARCH@/metview_bin
 MARS_HOME=
-# Remove METVIEW_DIR_DEV on installation
-METVIEW_DIR_DEV=UNDEFINED
+# Remove METVIEW_DIR_DEV on installation; inherit from environment during build
+# METVIEW_DIR_DEV=UNDEFINED
 METVIEW_TITLE_PROD="Production "
 METVIEW_TITLE_DEV="Development "
 MV_ENVIRON=common
diff --git a/debian/rules b/debian/rules
index d7fbcef..4449679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,16 @@ export DEB_CFLAGS_MAINT_APPEND
 DESTDIR:=$(CURDIR)/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-export METVIEW_DIR_DEV=$(CURDIR)
 PATH:=$(PATH):$(CURDIR)/scripts
 MV_DIR:=/usr/lib/$(DEB_HOST_MULTIARCH)/metview
+export METVIEW_DIR_DEV:=$(CURDIR)/debian/build
 
 # magic debhelper rule
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --buildsystem=cmake --builddirectory=$(METVIEW_DIR_DEV)
 
 override_dh_auto_clean:
 	dh_clean
-	rm -rf obj-*
 	rm -f share/metview/icons/make.dep \
 		share/metview/app-defaults/MvVersionDetails  
 	find . -type l -delete
@@ -48,8 +47,10 @@ override_dh_auto_test:
 override_dh_auto_install:
 	# override CONFIG.site to make reproducible, set METVIEW_BIN_DIR
 	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in \
-		> obj-*/scripts/CONFIG.site 
+		> $(METVIEW_DIR_DEV)/scripts/CONFIG.site 
 	dh_auto_install
+	mkdir -p debian/metview/$(MV_DIR)
+	mv debian/metview/usr/lib/metview debian/metview/$(MV_DIR)
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
 

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