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

[dmichelsen at users.sourceforge.net]

Revision: 9203
          http://gar.svn.sourceforge.net/gar/?rev=9203&view=rev
Author:   dmichelsen
Date:     2010-03-16 13:35:08 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
mGAR v2: Fix collapsed modulations

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-03-16 12:53:28 UTC (rev 9202)
+++ csw/mgar/gar/v2/gar.mk	2010-03-16 13:35:08 UTC (rev 9203)
@@ -228,8 +228,7 @@
 # Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar)
 define modulationvalue
 $(strip $(or $($(1)_$(MODULATION)),\
-             $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\
-             $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\
+             $($(1)_$(MODULATION_ISACOLLAPSED)),\
 ))
 endef
 
@@ -613,7 +612,7 @@
 endif
 
 # These directories get relocated into their ISA subdirectories
-MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION))
+MERGE_DIRS ?= $(call modulationvalue,MERGE_DIRS)
 
 ifneq ($(COMMON_PKG_DEPENDS),)
 _EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS)


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