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

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-22 18:34:12 +0000 (Tue, 22 Apr 2008)
New Revision: 1790

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Ensure that make distclean is run


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-04-22 17:43:06 UTC (rev 1789)
+++ octave/trunk/debian/changelog	2008-04-22 18:34:12 UTC (rev 1790)
@@ -5,9 +5,9 @@
     + 50_drop-lo-manpages.dpatch
     + 50_dont_downcase_font_names.dpatch
     + 50_clean-doc.dpatch
-  * debian/rules (clean): Remove config.log
+  * debian/rules (clean): Ensure that make distclean is run
 
- -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Apr 2008 19:37:26 +0200
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Apr 2008 20:33:41 +0200
 
 octave3.0 (1:3.0.0-11) unstable; urgency=low
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-04-22 17:43:06 UTC (rev 1789)
+++ octave/trunk/debian/rules	2008-04-22 18:34:12 UTC (rev 1790)
@@ -228,9 +228,14 @@
 	find doc -name \*.html | xargs rm -f
 
 	-test -f octMakefile-orig && mv octMakefile-orig octMakefile
-	[ ! -f Makefile ] || $(MAKE) -i distclean \
-		|| $(MAKE) -f Makefile.in distclean
 
+	# In order to run distclean, octMakefile should be used (actually
+	# octMakefile.in, which always exist).  However, Makeconf must
+	# always be present.
+	touch Makeconf
+	[ ! -f octMakefile.in ]	\
+		|| $(MAKE) -f octMakefile.in distclean
+
 	rm -f build-*-stamp configure-stamp make-*-stamp check-stamp	\
 		install-*-stamp Makefile.tmp octMakefile-*
 
@@ -244,9 +249,6 @@
 
 	rm -f debian/NEWS debian/temp
 
-	# The following was not necessary until 3.0.0
-	rm -f config.log
-
 	dh_clean
 
 install: install-arch install-indep