[Pkg-octave-commit] r1537 - octave-pkg-dev/trunk

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-31 14:23:16 +0000 (Mon, 31 Mar 2008)
New Revision: 1537

Modified:
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
* Also move PK_ADD away before running the unit tests
* Move PK_ADD.bak back into PKG_ADD using shell, not Octave

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 07:47:10 UTC (rev 1536)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 14:23:16 UTC (rev 1537)
@@ -41,17 +41,15 @@
 
 .PHONY: install-pkgs
 install-pkg:
-	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak;		\
+	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
 	@OCTAVE@ $(octave_options) --eval			\
 		"addpath ('$(shrpkg)/m', '-begin');		\
 		 pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],	\
 		      [pwd(),'/$(debpkg)/$(bpath)']);		\
 		 pkg ('local_list', [pwd(),'.']);		\
 		 pkg ('global_list', [pwd(),'.']);		\
-		 if (glob('PKG_ADD.bak')), 			\
-		 	movefile('PKG_ADD.bak', 'PKG_ADD');	\
-		 endif;						\
 		 pkg -verbose -nodeps install ."
+	[ ! -e PKG_ADD ] && mv PKG_ADD.bak PKG_ADD
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)
@@ -60,6 +58,7 @@
 check-pkg:
 	@echo Checking package...
 
+	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
 	@tmp=$$(tempfile) ;					\
 	echo "addpath (genpath ([pwd(),'/debian']));" > $$tmp ;	\
 	find debian/ -name \*.m					\
@@ -75,6 +74,7 @@
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi
+	[ ! -e PKG_ADD ] && mv PKG_ADD.bak PKG_ADD
 
 .PHONY: remove-dirs
 remove-dirs: