[rkward-cvs] SF.net SVN: rkward: [1970] trunk/rkward/debian

[tfry at users.sourceforge.net]

Revision: 1970
          http://rkward.svn.sourceforge.net/rkward/?rev=1970&view=rev
Author:   tfry
Date:     2007-09-19 07:04:53 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Merge debian package changes by Roland

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2007-09-17 22:56:16 UTC (rev 1969)
+++ trunk/rkward/debian/changelog	2007-09-19 14:04:53 UTC (rev 1970)
@@ -4,6 +4,7 @@
     closes: #432377
   * merge upstream fix for R 2.6
     closes: #442059
+  * changed distclean rule in debian/rules to only ignore missing Makefiles 
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Fri, 14 Sep 2007 13:30:00 +0200
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2007-09-17 22:56:16 UTC (rev 1969)
+++ trunk/rkward/debian/rules	2007-09-19 14:04:53 UTC (rev 1970)
@@ -56,7 +56,7 @@
 	rm -rf $(CURDIR)/debian/.svn
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.