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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-31 20:39:11 +0000 (Mon, 31 Mar 2008)
New Revision: 1547

Modified:
   octave-pkg-dev/trunk/README
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
* octave-pkg.mk.in: Use DEB_MAKE_CLEAN_TARGET as the target of the
  make clean command
* README: Document the changes related to the clean rule

Modified: octave-pkg-dev/trunk/README
===================================================================
--- octave-pkg-dev/trunk/README	2008-03-31 20:20:24 UTC (rev 1546)
+++ octave-pkg-dev/trunk/README	2008-03-31 20:39:11 UTC (rev 1547)
@@ -42,4 +42,8 @@
 directives.  Additional tests not contained in the upstream source
 files may be put in debian/check.m.
 
- -- Rafael Laboissiere <rafael at debian.org>, Thu, 20 Mar 2008 09:00:07 +0100
+The clean target follows the convention of CDBS.  For specifying it,
+use the DEB_MAKE_CLEAN_TARGET variable.  Its default value is "clean".
+
+
+ -- Rafael Laboissiere <rafael at debian.org>, Mon, 31 Mar 2008 22:36:22 +0200

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-31 20:20:24 UTC (rev 1546)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-31 20:39:11 UTC (rev 1547)
@@ -1,7 +1,9 @@
 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
+  * octave-pkg.mk.in:
+    + Avoid make failures if files PKG_ADD and/or PKG_ADD.bak do not exist
+    + Use DEB_MAKE_CLEAN_TARGET as the target of the make clean command
+  * README: Document the changes related to the clean rule
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 31 Mar 2008 18:00:11 +0200
 

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 20:20:24 UTC (rev 1546)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-31 20:39:11 UTC (rev 1547)
@@ -82,6 +82,10 @@
 		 $(CURDIR)/$(debpkg)/$(mpath)	\
 		 $(CURDIR)/$(debpkg)/$(bpath)
 
+DEB_MAKE_CLEAN_TARGET = clean
+
 clean::
-	-$(MAKE) -C src clean
+ifneq ($(DEB_MAKE_CLEAN_TARGET),)
+	-$(MAKE) $(DEB_MAKE_CLEAN_TARGET)
+endif
 	rm -rf inst/$(hosttype)-$(apiversion)