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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-31 20:20:24 +0000 (Mon, 31 Mar 2008)
New Revision: 1546

Modified:
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Instead of forcing the mv PKG_ADD commands to succeed, prefix them with "-"

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 16:01:04 UTC (rev 1545)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 20:20:24 UTC (rev 1546)
@@ -41,7 +41,7 @@
 
 .PHONY: install-pkgs
 install-pkg:
-	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak || true
+	-[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
 	@OCTAVE@ $(octave_options) --eval			\
 		"addpath ('$(shrpkg)/m', '-begin');		\
 		 pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],	\
@@ -49,7 +49,7 @@
 		 pkg ('local_list', [pwd(),'.']);		\
 		 pkg ('global_list', [pwd(),'.']);		\
 		 pkg -verbose -nodeps install ."
-	[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD || true
+	-[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)
@@ -58,7 +58,7 @@
 check-pkg:
 	@echo Checking package...
 
-	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak || true
+	-[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
 	@tmp=$$(tempfile) ;					\
 	echo "addpath (genpath ([pwd(),'/debian']));" > $$tmp ;	\
 	find debian/ -name \*.m					\
@@ -74,7 +74,7 @@
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi
-	[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD || true
+	-[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD
 
 .PHONY: remove-dirs
 remove-dirs: