Fixed config file reading when used in Ocera.

darcs-hash:20060622184824-f2ef6-23311bb4a7e6e245e345e68a722d28ea95423340.gz

diff --git a/snippets/base b/snippets/base
index 71031ca3c4947db8e5fbab53867fa855e1b45e92..6e2f4faa482fd2455c5e3d8e1609f10a48fff2b8 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -19,7 +19,7 @@ all: check-make-ver default
 #=========================
 # Include the config file
 
-ifneq ($(READ_CONFIG_FILE),no)
+ifneq ($(CONFIG_FILE_OK),y)
 ifndef CONFIG_FILE
 CONFIG_FILE      := $(MAKERULES_DIR)/config.omk
 endif
@@ -33,7 +33,7 @@ ifneq ($(wildcard $(CONFIG_FILE)),)
 include $(CONFIG_FILE)
 CONFIG_FILE_OK = y
 endif
-endif #$(READ_CONFIG_FILE)
+endif #$(CONFIG_FILE_OK)
 
 export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR
 export CONFIG_FILE OMK_SERIALIZE_INCLUDED OMK_VERBOSE OMK_SILENT

diff --git a/snippets/linux b/snippets/linux
index e8698ffbf11e346ff1a3f40dfe22192a11bafbe5..091fb6121c1c07820526cb88b54e6d15d8365707 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -595,7 +595,6 @@ endif
 export CHECK_DIR_DONE
 
 check-dir:
-       echo aaaaaaaaaaaaaa
        @$(call mkdir_def,$(USER_BUILD_DIR))
        @$(call mkdir_def,$(KERN_BUILD_DIR))
        @$(call mkdir_def,$(USER_INCLUDE_DIR))

diff --git a/snippets/linux-setup b/snippets/linux-setup
index 8bfa6be1fecdda999481dbcf923b619b3eb25610..ef953f7427fa4d3080476f7c13e149f5c2a2c8c9 100644 (file)
--- a/snippets/linux-setup
+++ b/snippets/linux-setup
@@ -26,8 +26,7 @@ USER_BUILD_DIR   := $(BUILD_DIR)/user/$(GROUP_DIR_NAME)
 #LINUX_DIR        := $(OCERA_DIR)/kernel/linux
 #RTL_DIR          := $(OCERA_DIR)/kernel/rtlinux
 #CONFIG_FILE      := $(OCERA_DIR)/emdebsys/.config 
-ifneq ($(wildcard $(CONFIG_FILE)),) # FIXME: What's this???
-#include $(CONFIG_FILE)
+ifneq ($(wildcard $(CONFIG_FILE)),)
 CONFIG_FILE_OK = y
 endif
 else # OCERA_DIR