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

[dmichelsen at users.sourceforge.net]

Revision: 8652
          http://gar.svn.sourceforge.net/gar/?rev=8652&view=rev
Author:   dmichelsen
Date:     2010-02-18 14:08:57 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
mGAR v2: Preset CATALOGNAME from default GARNAME or PACKAGES. This fixes #12

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-18 13:25:37 UTC (rev 8651)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-18 14:08:57 UTC (rev 8652)
@@ -32,10 +32,12 @@
 
 ifeq ($(origin PACKAGES), undefined)
 PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
+CATALOGNAME     = $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME))
 SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
 SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))
 else
+CATALOGNAME    ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(patsubst CSW%,%,$(PACKAGES)))
 SRCPACKAGE_BASE = $(firstword $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
 SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))


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