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

[dmichelsen at users.sourceforge.net]

Revision: 14321
          http://gar.svn.sourceforge.net/gar/?rev=14321&view=rev
Author:   dmichelsen
Date:     2011-04-18 14:28:29 +0000 (Mon, 18 Apr 2011)

Log Message:
-----------
mGAR v2: Fix substitution so that libraries with '+' in it works

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-04-18 14:21:03 UTC (rev 14320)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-04-18 14:28:29 UTC (rev 14321)
@@ -332,7 +332,7 @@
 
 # PKGFILES_LIB selects just one library. The '.' will be escaped automatically!
 # Use PKGFILES_CSWlibfoo1 = $(call pkgfiles_lib,libfoo.so.1)
-pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(1))(\.\d+)*)
+pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(subst +,\+,$(1)))(\.\d+)*)
 
 # PKGFILES_DEVEL selects files belonging to a developer package
 PKGFILES_DEVEL_CONFIG ?= $(call baseisadirs,$(bindir),[^/]*-config)


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