[csw-devel] SF.net SVN: gar:[3905] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 3905
          http://gar.svn.sourceforge.net/gar/?rev=3905&view=rev
Author:   dmichelsen
Date:     2009-03-24 10:49:16 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
mGAR v2: Allow dynamic gspec on cpan modules

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

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2009-03-24 09:39:33 UTC (rev 3904)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2009-03-24 10:49:16 UTC (rev 3905)
@@ -34,6 +34,7 @@
 SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
 
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
+_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec
 
 include gar/gar.mk
 

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-03-24 09:39:33 UTC (rev 3904)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-03-24 10:49:16 UTC (rev 3905)
@@ -299,6 +299,8 @@
 #   flagged with ARCHALL_<pkg> = 1 for a specific package or with ARCHALL = 1
 #   for all packages.
 
+_CATEGORY_GSPEC_INCLUDE ?= csw_dyngspec.gspec
+
 # This rule dynamically generates gspec-files
 .PRECIOUS: $(WORKDIR)/%.gspec
 $(WORKDIR)/%.gspec:
@@ -306,7 +308,7 @@
 		(echo "%var            bitname $(call catalogname,$*)"; \
 		echo "%var            pkgname $*"; \
 		$(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var            arch all";) \
-		echo "%include        url file://%{PKGLIB}/csw_dyngspec.gspec") >$@\
+		$(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include        url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\
 	)
 
 


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