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

[dmichelsen at users.sourceforge.net]

Revision: 13937
          http://gar.svn.sourceforge.net/gar/?rev=13937&view=rev
Author:   dmichelsen
Date:     2011-03-24 20:13:10 +0000 (Thu, 24 Mar 2011)

Log Message:
-----------
mGAR v2: Selectively unroll call to 'catalog' in generation of stub package catalog name

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-03-24 19:40:12 UTC (rev 13936)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-03-24 20:13:10 UTC (rev 13937)
@@ -63,7 +63,8 @@
 CATALOG_RELEASE ?= $(shell hostname | gsed -e 's/[0-9].*$$//')
 
 define obsoleted_pkg
-CATALOGNAME_$(1) ?= $(call catalogname,$(1))
+# function 'catalogname' must not be used due to recursive calls to CATALOGNAME_*
+CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst CSW%,%,$(1)))_stub
 # The length of the description has been limited to 100 characters,
 # the string is cut (no longer on word boundaries).
 SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e')


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