[metview] 35/97: Fix sed for mv_compress command

[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 f031914ca3cfacd6f1ad93631bf2e12b8860a773
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 20 01:22:54 2014 +0100

    Fix sed for mv_compress command
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index fa21866..7318825 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export DH_VERBOSE=1
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-TOPDIR=:=$(shell pwd)
+TOP:=$(shell pwd)
 
 MV_COMP:=$(TOP)/debian/tmp/usr/lib/MetView/mv_compress
 
@@ -20,7 +20,7 @@ MV_COMP:=$(TOP)/debian/tmp/usr/lib/MetView/mv_compress
 	dh $@ --with autoreconf
 
 override_dh_auto_clean:
-	[-f Makefile ] && $(MAKE) -k clean
+	-$(MAKE) -k clean
 	dh_clean
 	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
@@ -36,9 +36,6 @@ override_dh_auto_configure:
 		--enable-magics \
 		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \
 		CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
-	sed -e 's%function findCommonPath()%findCommonpath()%' <  \
-		< $(MV_COMP) >  $(MV_COMP).tmp
-	mv $(MV_COMP).tmp  $(MV_COMP)
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
@@ -47,6 +44,9 @@ override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
+	sed -e 's%function findCommonPath()%findCommonpath()%'  \
+		< $(MV_COMP) >  $(MV_COMP).tmp
+	mv $(MV_COMP).tmp  $(MV_COMP)
 	chmod -R -x debian/tmp/usr/share/metview/*
 
 override_dh_auto_fixperms:

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