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

[dmichelsen at users.sourceforge.net]

Revision: 8173
          http://gar.svn.sourceforge.net/gar/?rev=8173&view=rev
Author:   dmichelsen
Date:     2010-01-25 15:01:11 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
automake: Exclude merging of automake and aclocal for old versions as hardlinks confuse the merging, this fixes #4184

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

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2010-01-25 15:00:42 UTC (rev 8172)
+++ csw/mgar/pkg/automake/trunk/Makefile	2010-01-25 15:01:11 UTC (rev 8173)
@@ -3,7 +3,6 @@
 CATEGORIES = devel
 
 EXTRA_MODULATORS = GARVERSION
-# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on
 MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.1
 
 DESCRIPTION = A tool for automatically generating Makefiles.
@@ -40,7 +39,12 @@
 
 $(foreach VERSION,$(MODULATIONS_GARVERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-garversion-$(VERSION) = copy-all))
 
-#CLEAN_SCRIPTS = custom
+# These are hardlinks to the versioned versions and will confuse the merging
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal
 
 include gar/category.mk
 


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