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

[bdwalton at users.sourceforge.net]

Revision: 13316
          http://gar.svn.sourceforge.net/gar/?rev=13316&view=rev
Author:   bdwalton
Date:     2011-02-15 01:56:32 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------
gar/v2: complete the integration of cas cswcptemplates

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-02-15 01:24:14 UTC (rev 13315)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-02-15 01:56:32 UTC (rev 13316)
@@ -202,7 +202,6 @@
 
 # - set class for all config files
 _CSWCLASS_FILTER = | perl -ane '\
-		$(foreach FILE,$(CPTEMPLATES),$$F[1] = "cswcptemplates" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\
 		$(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\
@@ -214,6 +213,7 @@
 		$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
 		$(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \
+		$$F[1] = "cswcptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \
 		print join(" ", at F),"\n";'
 
 # If you add another filter above, also add the class to this list. It is used
@@ -225,7 +225,7 @@
 #	you need to ensure any binaries and config files are already on disk
 #	and able to be consumed by a service that might be started.
 
-_CSWCLASSES  = cswmigrateconf cswcpsampleconf cswpreserveconf
+_CSWCLASSES  = cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates
 _CSWCLASSES += cswetcservices
 _CSWCLASSES += cswusergroup ugfiles
 _CSWCLASSES += cswcrontab


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