[csw-devel] SF.net SVN: gar:[3756] csw/mgar/gar/v2/gar.lib.mk

[bdwalton at users.sourceforge.net]

Revision: 3756
          http://gar.svn.sourceforge.net/gar/?rev=3756&view=rev
Author:   bdwalton
Date:     2009-03-14 00:49:23 +0000 (Sat, 14 Mar 2009)

Log Message:
-----------
Fix the makepatch target so it works in GAR v2 again.

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2009-03-13 20:02:25 UTC (rev 3755)
+++ csw/mgar/gar/v2/gar.lib.mk	2009-03-14 00:49:23 UTC (rev 3756)
@@ -426,11 +426,11 @@
 	@echo " ==> Creating patch $@"
 	@EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract
 	@PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch
-	@mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC).orig
-	@( cd $(WORKDIR); \
+	@mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig
+	@( cd $(WORKDIR_FIRSTMOD); \
 		if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \
 			cd $(CURDIR); \
-			mv -f $(WORKDIR)/gar-base.diff $@; \
+			mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \
 		fi )
 
 ### PATCH FILE TYPE MAPPINGS ###


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