[Pkg-octave-commit] r1545 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-31 16:01:04 +0000 (Mon, 31 Mar 2008)
New Revision: 1545

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Avoid make failures if files PKG_ADD and/or PKG_ADD.bak do not exist

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-31 15:54:30 UTC (rev 1544)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-31 16:01:04 UTC (rev 1545)
@@ -1,3 +1,10 @@
+octave-pkg-dev (0.5.2) UNRELEASED; urgency=low
+
+  * octave-pkg.mk.in: Avoid make failures if files PKG_ADD and/or
+    PKG_ADD.bak do not exist
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 31 Mar 2008 18:00:11 +0200
+
 octave-pkg-dev (0.5.1) unstable; urgency=low
 
   [ Thomas Weber ]

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 15:54:30 UTC (rev 1544)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 16:01:04 UTC (rev 1545)
@@ -41,7 +41,7 @@
 
 .PHONY: install-pkgs
 install-pkg:
-	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
+	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak || true
 	@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 ] && mv PKG_ADD.bak PKG_ADD
+	[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD || true
 	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
+	[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak || true
 	@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 ] && mv PKG_ADD.bak PKG_ADD
+	[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD || true
 
 .PHONY: remove-dirs
 remove-dirs: