[metview] 36/97: Build CONFIG.site by hand and install. Needed for metview to work right

[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 7277a7263a4e63bb2b4f64f8243853a55ad62c5f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 20 03:10:15 2014 +0100

    Build CONFIG.site by hand and install. Needed for metview to work right
---
 debian/CONFIG.site | 20 ++++++++++++++++++++
 debian/rules       | 10 ++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/CONFIG.site b/debian/CONFIG.site
new file mode 100644
index 0000000..250bf8e
--- /dev/null
+++ b/debian/CONFIG.site
@@ -0,0 +1,20 @@
+#
+# THIS FILE IS GENERATED BY configure Fri Jun 20 02:40:00 IST 2014
+#
+WMO_SITE_NR=255
+INSTALLDIR=/usr
+METVIEW_SCRIPT=/usr/bin/metview
+MV_MARS_ACCESS=MARS_none
+MARS_HOME=
+METVIEW_DIR_DEV=
+METVIEW_BIN=/usr/lib/MetView
+METVIEW_TITLE_PROD="Production "
+METVIEW_TITLE_DEV="Development autotools "
+MV_ENVIRON=common
+OS=linux
+MAJOR_VERSION=3
+SHELL=/bin/sh
+MAGPLUS_HOME=/usr
+GRIBAPI_DIR=/usr/share/grib_api
+METVIEW_EXTRA_GRIB_DEFINITION_PATH=/usr/share/grib_api/definitions
+MV_PYTHON_COMMAND=python
diff --git a/debian/rules b/debian/rules
index 7318825..3e5bcc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 TOP:=$(shell pwd)
 
-MV_COMP:=$(TOP)/debian/tmp/usr/lib/MetView/mv_compress
+MV_COMP:=$(TOP)/debian/tmp/usr/bin/MetView/mv_compress
 
 # magic debhelper rule
 %:
@@ -22,13 +22,14 @@ MV_COMP:=$(TOP)/debian/tmp/usr/lib/MetView/mv_compress
 override_dh_auto_clean:
 	-$(MAKE) -k clean
 	dh_clean
-	rm -f share/metview/icons/make.dep config/CONFIG.site share/metview/app-defaults/MvVersionDetails  \
+	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
 	find . -name '*.db' -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.
+# 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:
@@ -36,6 +37,7 @@ override_dh_auto_configure:
 		--enable-magics \
 		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \
 		CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
+	cp debian/CONFIG.site config/CONFIG.site
 
 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