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

[bdwalton at users.sourceforge.net]

Revision: 13299
          http://gar.svn.sourceforge.net/gar/?rev=13299&view=rev
Author:   bdwalton
Date:     2011-02-14 03:07:31 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
gar/v2: change the URLS construction to use newly non-recursive DYNURLS based on DYNSCRIPTS.  this fixes a breakage introduced in 11591 wrt dynamic admscripts

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2011-02-14 03:06:17 UTC (rev 13298)
+++ csw/mgar/gar/v2/gar.lib.mk	2011-02-14 03:07:31 UTC (rev 13299)
@@ -27,11 +27,11 @@
 
 #################### FETCH RULES ####################
 
-URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES)))
+# if the caller has defined _postinstall, etc targets for a package,
+# add these 'dynamic script' targets to our fetch list
+DYNURLS := $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN))
 
-# if the caller has defined _postinstall, etc targets for a package, add
-# these 'dynamic script' targets to our fetch list
-URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN))
+URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) $(DYNURLS)
 
 define gitsubst
 $(subst git-git,git,$(if $(findstring $(1)://,$(2)),$(patsubst $(1)%,git-$(1)%,$(call URLSTRIP,$(2)))))


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