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

[dmichelsen at users.sourceforge.net]

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

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

Modified: csw/mgar/pkg/libneon27/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libneon27/trunk/Makefile	2012-01-23 12:29:56 UTC (rev 16885)
+++ csw/mgar/pkg/libneon27/trunk/Makefile	2012-01-23 12:30:18 UTC (rev 16886)
@@ -100,10 +100,8 @@
 EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
 EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
 
-EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-i386-features-full    += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
-EXTRA_PAX_ARGS_isa-amd64-features-full   += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
+EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
 
 MERGE_SCRIPTS_isa-default-features-minimal = copy-all
 MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only
@@ -117,8 +115,8 @@
 
 include gar/category.mk
 
-post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27
-post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: 
+post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27
+post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal:
 	rm -f $(WORKSRC)/src/libneon.la
 	$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS)
 	@$(MAKECOOKIE)

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