[pyferret] 79/110: Do all in install step, after dh_prep has cleaned debian/tmp

[Alastair McKinstry]

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

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

commit a86ae93479acd279b0819d41541393f3f93f708f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 14 09:44:03 2016 +0100

    Do all in install step, after dh_prep has cleaned debian/tmp
---
 debian/rules | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index c575dec..214af2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ INSTALLDIR:=$(CURDIR)/debian/tmp
 PY2:=$(shell pyversions -r)
 PY3:=$(shell py3versions -r)
 
-override_dh_auto_build:
+override_dh_auto_make:
 	cp debian/platform_specific.mk.debian .
 	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
 	sed -e 's%@ARCH@%${ARCH}%' \
@@ -27,6 +27,8 @@ override_dh_auto_build:
                 -e 's%@INSTALLDIR@%${INSTALLDIR}%' \
                 < debian/site_specific.mk.in > site_specific.mk
 	cp site_specific.mk external_functions/ef_utility
+
+override_dh_auto_install:
 	# Need temp. libraries during build.
 	mkdir -p $(INSTALLDIR)/lib/$(PY2)
 	mkdir -p $(INSTALLDIR)/lib/$(PY3)
@@ -36,10 +38,8 @@ override_dh_auto_build:
 		$(INSTALLDIR)/lib/$(PY3)/libpyferret.so
 	# Build and install 
 	for p in $(PY2) $(PY3) ; do \
-		$(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p all install ; \
+		$(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p clean all install ; \
 		done
-
-override_dh_auto_install:
 	find debian -name '*.pyo' -o -name '*.pyc' -delete
 	find debian -type d -name __pycache__ -delete
 	dh_numpy
@@ -57,6 +57,5 @@ override_dh_auto_clean:
 	rm -rf ./build ./install
 	find . -type l  -delete 
 	find . -name '*.o' -o -name '*.so'  -delete
-	find external_functions -type l -delete
 	[ ! -f platform_specific_flags.mk.debian ]  || $(MAKE)  clean HOSTTYPE=debian 
 

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