Changeset 16453 in vbox

Timestamp:

Feb 2, 2009 10:55:45 AM (16 years ago)

Author:

vboxsync

Message:

Config.kmk: properly handle passing alternative locations for AUTOCFG and LOCALCFG in the environment

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)
+AUTOCFG ?= $(wildcard $(PATH_ROOT)/AutoConfig.kmk)
 ifeq ($(AUTOCFG),)
  # deprecated name. to be removed.
@@ -613 +613 @@
 endif
 
-LOCALCFG := $(wildcard $(PATH_ROOT)/LocalConfig.kmk)
+LOCALCFG ?= $(wildcard $(PATH_ROOT)/LocalConfig.kmk)
 ifeq ($(LOCALCFG),)
  # deprecated name. to be removed.
@@ -620 +620 @@
   $(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),)