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

[dmichelsen at users.sourceforge.net]

Revision: 15590
          http://gar.svn.sourceforge.net/gar/?rev=15590&view=rev
Author:   dmichelsen
Date:     2011-09-09 08:20:24 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
wget: Adjust merge rules

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

Modified: csw/mgar/pkg/wget/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wget/trunk/Makefile	2011-09-09 07:37:23 UTC (rev 15589)
+++ csw/mgar/pkg/wget/trunk/Makefile	2011-09-09 08:20:24 UTC (rev 15590)
@@ -60,14 +60,10 @@
 
 EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias
 
-MERGE_SCRIPTS_isa-sparcv8-static-disable = copy-all
- MERGE_SCRIPTS_isa-sparcv8-static-enable = copy-static-wget-only
-    MERGE_DIRS_isa-sparcv8-static-enable = $(bindir)
+MERGE_SCRIPTS_isa-default-static-disable = copy-all
+ MERGE_SCRIPTS_isa-default-static-enable = copy-static-wget-only
+    MERGE_DIRS_isa-default-static-enable = $(bindir)
 
-    MERGE_SCRIPTS_isa-i386-static-disable = copy-all
-     MERGE_SCRIPTS_isa-i386-static-enable = rename-wget copy-only
-        MERGE_DIRS_isa-i386-static-enable = $(bindir)
-
 # This is ok, it is just one example occurrence, all others have been replaced
 CHECKPKG_OVERRIDES_CSWwget += file-with-bad-content|/usr/local|root/opt/csw/share/info/wget.info
 

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