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

[dmichelsen at users.sourceforge.net]

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

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

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 12:30:18 UTC (rev 16886)
+++ csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 12:30:40 UTC (rev 16887)
@@ -83,34 +83,20 @@
 # XXX: Assembler optimization just doesn't work. Disable for now.
 CONFIGURE_ARGS += --disable-asm-optimizations
 
-MERGE_SCRIPTS_isa-i386-version-1.0.4 = copy-only
-MERGE_DIRS_isa-i386-version-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-version-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.0.4 = copy-only
+MERGE_DIRS_isa-default-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-version-1.1.2 = copy-only
-MERGE_DIRS_isa-i386-version-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-version-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.1.2 = copy-only
+MERGE_DIRS_isa-default-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-version-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-version-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-extra-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-version-1.0.4 = copy-only
-MERGE_DIRS_isa-sparcv8-version-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-version-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.0.4 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-version-1.1.2 = copy-only
-MERGE_DIRS_isa-sparcv8-version-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-version-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.1.2 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-version-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-version-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
 PKGFILES_CSWxmmsflac = $(libdir)/xmms/.*
 
 include gar/category.mk

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