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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Feb 11 10:56:22 CET 2010


Revision: 8483
          http://gar.svn.sourceforge.net/gar/?rev=8483&view=rev
Author:   dmichelsen
Date:     2010-02-11 09:56:22 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
mGAR v2: Fix override variable assembly

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-11 09:33:18 UTC (rev 8482)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-11 09:56:22 UTC (rev 8483)
@@ -662,9 +662,9 @@
 merge-checkpkgoverrides-%:
 	@echo "[ Generating checkpkg override for package $* ]"
 	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides
-	$(_DBG)$(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O" | \
-		perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); print "$$F[0]: $$F[1]";print " $$F[2]" if( $$F[2] );' \
-		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*))
+	$(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \
+		perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); $$F[0].=":"; print join(" ", at F );' \
+		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)
 	@$(MAKECOOKIE)
 
 merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))


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


More information about the devel mailing list