[csw-devel] SF.net SVN: gar:[7989] csw/mgar/gar/v2/gar.mk

[dmichelsen at users.sourceforge.net]

Revision: 7989
          http://gar.svn.sourceforge.net/gar/?rev=7989&view=rev
Author:   dmichelsen
Date:     2010-01-13 16:13:54 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
mGAR v2: Make sure default merge rules work also when only one ISA is requested

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-01-13 15:34:55 UTC (rev 7988)
+++ csw/mgar/gar/v2/gar.mk	2010-01-13 16:13:54 UTC (rev 7989)
@@ -594,7 +594,9 @@
 endif
 
 ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT))
-MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
+MERGE_SCRIPTS_isa-default ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
+MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default)
+MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED))
 else
 ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))


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