[Pkg-octave-commit] r987 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-07-24 18:54:52 +0000 (Tue, 24 Jul 2007)
New Revision: 987

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
* debian/rules: Do not ignore make clean error


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-07-24 18:53:04 UTC (rev 986)
+++ octave/trunk/debian/changelog	2007-07-24 18:54:52 UTC (rev 987)
@@ -7,6 +7,7 @@
   * debian/in/control: Removed the obsolete build-dependency on dejagnu
     (over two years ago, DejaGNU was replaced by the test/assert
     infrastructure for running the tests)
+  * debian/rules: Do not ignore make clean error
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 23 Jul 2007 23:06:54 +0200
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-07-24 18:53:04 UTC (rev 986)
+++ octave/trunk/debian/rules	2007-07-24 18:54:52 UTC (rev 987)
@@ -184,20 +184,21 @@
 check: configure-stamp make-arch-stamp check-stamp
 check-stamp:
 	ln -fs octMakefile-no-doc octMakefile
-	-$(MAKE) 	check
+	-$(MAKE) check
 	touch check-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) -C doc clean
-	-$(MAKE) -C doc/interpreter/images distclean
-	-$(MAKE) -C doc maintainer-clean
+	[ ! -f doc/Makefile ] || $(MAKE) -C doc clean
+	[ ! -f doc/Makefile ] || $(MAKE) -C doc/interpreter/images distclean
+	[ ! -f doc/Makefile ] || $(MAKE) -C doc maintainer-clean
 	find doc -name \*.info\* | xargs rm -f
 
 	-test -f octMakefile-orig && mv octMakefile-orig octMakefile
-	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
+	[ ! -f Makefile ] || $(MAKE) -i distclean \
+		|| $(MAKE) -f Makefile.in distclean
 
 	rm -f build-*-stamp configure-stamp make-*-stamp check-stamp	\
 		install-*-stamp Makefile.tmp octMakefile-*