Changeset 01e7043 in mainline for Makefile

Timestamp:

2010-12-05T12:59:48Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8fe3f832

Parents:

f5211ee (diff), 6ec0acd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge two-level profile fix.

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -41 +41 @@
 CONFIG_HEADER = config.h
 
-ifeq ($(PROFILE),)
-        PRESETS_FILE =
-else
-        PRESETS_FILE = defaults/$(PROFILE)/Makefile.config
-endif
-
 .PHONY: all precheck cscope autotool config_auto config_default config distclean clean
 
@@ -72 +66 @@
 
 config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default $(PRESETS_FILE)
+        $(CONFIG) $< default $(PROFILE)
 
 config: $(CONFIG_RULES)