Revision: 6425
http://gar.svn.sourceforge.net/gar/?rev=6425&view=rev
Author: dmichelsen
Date: 2009-09-23 10:24:13 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
mGAR v2: Fix auto-replacement of .CSW in cswclassutils
Modified Paths:
--------------
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-09-23 10:24:07 UTC (rev 6424)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-23 10:24:13 UTC (rev 6425)
@@ -169,8 +169,8 @@
# - set class for all config files
ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),)
_CSWCLASS_FILTER = | perl -ane '\
- $(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$$) );)\
+ $(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$$) );)\
$(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~
m(^$(FILE)$$) );)\
$(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2]
=~ m(^$(FILE)$$) );)\
$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] =
"cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
@@ -178,7 +178,7 @@
_EXTRA_GAR_PKGS += CSWcswclassutils
# Make sure the configuration files always have a .CSW suffix and rename the
# configuration files to this if necessary during merge.
-_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%.CSW=%)
$(PRESERVECONF:%.CSW=%),-s ",^\.\($(FILE)\)$$,.\1.CSW,p")
+_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%)
$(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p")
endif
PKGGET_DESTDIR ?=
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
