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

[dmichelsen at users.sourceforge.net]

Revision: 17650
          http://gar.svn.sourceforge.net/gar/?rev=17650&view=rev
Author:   dmichelsen
Date:     2012-04-13 14:05:07 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
mGAR v2: Fix merging of 64 bit

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-04-13 13:39:13 UTC (rev 17649)
+++ csw/mgar/gar/v2/gar.mk	2012-04-13 14:05:07 UTC (rev 17650)
@@ -780,7 +780,7 @@
 MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED))
 
 MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
-MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate)
+MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate,copy-relocated-only copy-config-only) $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-default64) $(EXTRA_MERGE_SCRIPTS)
 MERGE_SCRIPTS_isa-extra ?= copy-relocated-only copy-config-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-extra) $(EXTRA_MERGE_SCRIPTS)
 MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA))
 MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED))

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