summaryrefslogtreecommitdiff
path: root/cesar/common
diff options
context:
space:
mode:
authorschodet2008-09-15 14:05:13 +0000
committerschodet2008-09-15 14:05:13 +0000
commita853e631bd397360f4e7212b8c7a80ebc4e0cc2e (patch)
treeb869c2d064a32a0ce340ae6b02d5f953ec423199 /cesar/common
parent4c3d81c9db2521adcdb46368e099bcb34ba7aa50 (diff)
* common/make:
- added the feature to change the Config file for a module. Can be used to provide different default configure item values. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2965 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/common')
-rw-r--r--cesar/common/make/setup.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/cesar/common/make/setup.mk b/cesar/common/make/setup.mk
index f1cdeeedbc..5504b2a538 100644
--- a/cesar/common/make/setup.mk
+++ b/cesar/common/make/setup.mk
@@ -29,7 +29,8 @@ SOURCES := $$(call default,$(call mod2var,$1)_MODULE_SOURCES,$$(SOURCES))
$(call mod2var,$1)_MODULE_SOURCES := $$(call src2src,$$(SOURCES),$1/src)
SOURCES :=
# Merge module configuration.
-MODULES_CONFIG += $$(wildcard $$(BASE)/$1/Config)
+MODULES_CONFIG += $$(if $$(CONFIG),$$(BASE)/$1/$$(CONFIG),$$(wildcard $$(BASE)/$1/Config))
+CONFIG :=
# Add any dependent modules.
MODULES := $$(call default,$(call mod2var,$1)_MODULE_MODULES,$$(MODULES))
$(call mod2var,$1)_MODULE_MODULES := $$(MODULES)