[emos] 05/08: Set INTERPOL_TABLES_PATH during build to be install 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 emos.

commit 6e53bfd8ced7ab18fc0ba836ab050c765ccee80c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 28 11:16:21 2015 +0000

    Set INTERPOL_TABLES_PATH during build to be install location
---
 debian/changelog | 1 +
 debian/rules     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b5d991b..06b40fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 emoslib (2:4.1.1-5) UNRELEASED; urgency=medium
 
   * Add s390x to the list of archs on which we disable tests.
+  * Set INTERPOL_TABLES_PATH during build to be install location
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 11:13:56 +0000
 
diff --git a/debian/rules b/debian/rules
index f41181e..726dc81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ MCMODEL_FLAGS:=''
 BUILD_FLAGS:=''
 FPIC:= -fpic
 
+ifeq ($(ARCH), s390x)
+   DO_TEST:= false
+endif
 ifeq ($(ARCH), powerpc)
    DO_TEST:= false
 endif
@@ -65,6 +68,7 @@ override_dh_auto_configure:
 		-DBUILD_FLAGS=${BUILD_FLAGS} \
 		-DFPIC=${FPIC} \
 		-DINSTALL_LIBDIR=${LIBDIR} \
+		-DINTERPOL_TABLES_PATH=/usr/share/emos \
 		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables \
 		-DTEST_BUFR_TABLES_PATH=${CURDIR}/bufrtables
 	for f in ${AUTOGENERATED} ; do \
@@ -77,7 +81,6 @@ override_dh_auto_build:
 	cd obj-* && $(MAKE) install
 
 # TODO: CHECK INTERPOL_TABLES_PATH is set correctly.		
-		# -DINTERPOL_TABLES_PATH=/usr/share/emos \
 
 override_dh_auto_install:
 	cd obj-* && $(MAKE) install

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