[csw-devel] SF.net SVN: gar:[7110] csw/mgar/gar/v2/gar.pkg.mk

[dmichelsen at users.sourceforge.net]

Revision: 7110
          http://gar.svn.sourceforge.net/gar/?rev=7110&view=rev
Author:   dmichelsen
Date:     2009-11-04 20:33:03 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
mGAR v2: Fix repackage so it doesn't delete package-relevant files from DISTFILES

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-11-04 20:23:48 UTC (rev 7109)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-11-04 20:33:03 UTC (rev 7110)
@@ -662,10 +662,9 @@
 
 pkgreset-%:
 	@echo " ==> Reset packaging state for $* ($(DESTIMG))"
-	@rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**)
-	@rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package
-	@rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype
-	@rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright
+	$(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**)
+	$(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package
+	$(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright))
 
 repackage: pkgreset package
 


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