[csw-devel] SF.net SVN: gar:[16884] csw/mgar/pkg/libcurl4/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 16884
          http://gar.svn.sourceforge.net/gar/?rev=16884&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:29:33 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/libcurl4/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2012-01-23 12:29:09 UTC (rev 16883)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2012-01-23 12:29:33 UTC (rev 16884)
@@ -117,10 +117,8 @@
 # We do special 32/64 merging for this one, see post-merge
 EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h
 
-EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-i386-features-full    += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
-EXTRA_PAX_ARGS_isa-amd64-features-full   += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
+EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
 
 # We select pkgconfig for minimal library bindings. As libneon is self-contained (links
 # to all necessary libs directly) the full version can simly be linked in.

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