Changeset 16460 in vbox

Timestamp:

Feb 2, 2009 1:34:39 PM (16 years ago)

Author:

vboxsync

Message:

Config.kmk: Rewrote r42325 as you need to be more forceful when changing variables from the command line and because we wish to avoid unncessary expansion of wildcard function calls. Dropped the Config.kmkconf and Config.kmklocal legacy.

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -601 +601 @@
 # and to provide defaults for the settings below this point.
 #
-AUTOCFG ?= $(wildcard $(PATH_ROOT)/AutoConfig.kmk)
-ifeq ($(AUTOCFG),)
- # deprecated name. to be removed.
- AUTOCFG := $(wildcard $(PATH_ROOT)/Config.kmkconf)
- ifneq ($(AUTOCFG),)
-  $(warning Config.kmkconf has been renamed. Please re-run configure.)
- endif
+ifndef AUTOCFG
+ AUTOCFG := $(wildcard $(PATH_ROOT)/AutoConfig.kmk)
 endif
 ifneq ($(AUTOCFG),)
@@ -613 +608 @@
 endif
 
-LOCALCFG ?= $(wildcard $(PATH_ROOT)/LocalConfig.kmk)
-ifeq ($(LOCALCFG),)
- # deprecated name. to be removed.
- LOCALCFG := $(wildcard $(PATH_ROOT)/Config.kmklocal)
+ifndef LOCALCFG
+ LOCALCFG := $(wildcard $(PATH_ROOT)/LocalConfig.kmk)
  ifneq ($(LOCALCFG),)
-  $(warning Please rename your Config.kmklocal to LocalConfig.kmk.)
- endif
-endif
-# We want to be able to pass an alternative location for LocalConfig.kmk
-# without actually requiring it to exist.
-ifeq ($(wildcard $(LOCALCFG)),)
- LOCALCFG=
-endif
-ifneq ($(LOCALCFG),)
- include $(LOCALCFG)
+  include $(LOCALCFG)
+ endif
+else
+ # Ignore it if it doesn't exist.
+ if exists "$(LOCALCFG)"
+  include $(LOCALCFG)
+ else
+  $(warning LOCALCFG='$(LOCALCFG)' does not exists)
+  override LOCALCFG :=
+ endif
 endif
 
@@ -3626 +3619 @@
 # Legacy.
 #
+## @todo try remove this.
 ifneq ($(LOCALCFG),)
  include $(LOCALCFG)