[pyferret] 76/110: Don't clean out ./install and ./build directory between builds. Just old .o files

[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 f4851fdaad4a58acd726dad0a5af0c59057ba41d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 14 04:39:05 2016 +0100

    Don't clean out ./install and ./build directory between builds. Just old .o files
---
 debian/patches/soname-fix.patch | 9 +++++++++
 debian/rules                    | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
index 8ea1602..7a5c0b3 100644
--- a/debian/patches/soname-fix.patch
+++ b/debian/patches/soname-fix.patch
@@ -24,6 +24,15 @@ Index: pyferret-7.0.0/Makefile
  
  .PHONY : externals_optimized
  externals_optimized :
+@@ -114,7 +116,7 @@ clean :
+ 	$(MAKE) -C $(DIR_PREFIX)/bench clean
+ 	$(MAKE) -C $(DIR_PREFIX)/bin/build_fonts/unix clean
+ 	$(MAKE) -C $(DIR_PREFIX)/external_functions clean
+-	rm -fr $(DIR_PREFIX)/install $(DIR_PREFIX)/build ferret.jnl*
++        # rm -fr $(DIR_PREFIX)/install $(DIR_PREFIX)/build ferret.jnl*
+ 	find $(DIR_PREFIX)/pviewmod -name '*.py[co]' -exec rm -f {} ';'
+ 	find $(DIR_PREFIX)/pyfermod -name '*.py[co]' -exec rm -f {} ';'
+ 	$(MAKE) -C $(DIR_PREFIX)/threddsBrowser clean
 @@ -147,7 +149,7 @@ update :
  	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
  	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
diff --git a/debian/rules b/debian/rules
index 20f0094..b05e3ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_build:
 	mkdir -p $(INSTALLDIR)/lib/$(PY2)
 	mkdir -p $(INSTALLDIR)/lib/$(PY3)
 	ln -s $(CURDIR)/install/lib/$(PY2)/site-packages/pyferret/libpyferret.so \
-		$(INSTALLDIR)/lib/$(PY2)/site-packages/pyferret/libpyferret.so
+		$(INSTALLDIR)/lib/$(PY2)/libpyferret.so
 	ln -s $(CURDIR)/install/lib/$(PY3)/site-packages//pyferret/libpyferret.cpython-35m-$(ARCH).so \
 		$(INSTALLDIR)/lib/$(PY3)/libpyferret.so
 
@@ -53,6 +53,7 @@ override_dh_auto_test:
 override_dh_auto_clean:
 	# use system xpm.h, not supplied ones
 	rm -f fer/gui/xpm*.h
+	rm -rf ./build ./install
 	find . -type l  -delete 
 	find . -name '*.o' -delete
 	find . -name '*.so' -delete

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