Changeset 874 for trunk/kBuild

Timestamp:

Apr 6, 2007, 8:01:14 PM (18 years ago)

Author:

bird

Message:

Moved the PATH_* finalizing to header.kmk and applied abspath to all of them.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (1 diff)
• header.kmk (modified) (2 diffs)

trunk/kBuild/footer.kmk

@@ -27 +27 @@
 ifndef __footer_kmk__
 # start-of-file-content
-
-#
-# Make sure that the core variables we defined in recursive expansion mode
-# up in header.kmk get expanded before we really start using them. The kBuild
-# functions added to kmk to speed stuff up assumes that the variables are
-# expanded here.
-#
-PATH_OBJ    := $(PATH_OBJ)
-PATH_TARGET := $(PATH_TARGET)
-PATH_INS    := $(PATH_INS)
-PATH_BIN    := $(PATH_BIN)
-PATH_DLL    := $(PATH_DLL)
-PATH_SYS    := $(PATH_SYS)
-PATH_LIB    := $(PATH_LIB)
-PATH_DOC    := $(PATH_DOC)
 
 #

trunk/kBuild/header.kmk

@@ -749 +749 @@
 # Include the config.kmk we found file (or the default one).
 include $(_CFGFILE)
+
+
+#
+# Finalize a the central path variables now that we've included the Config.kmk file.
+#
+# This prevents some trouble when users override the defaults for these
+# variables and uses relative paths or paths with incorrect case.
+#
+PATH_OUT    := $(abspath $(PATH_OUT))
+PATH_OBJ    := $(abspath $(PATH_OBJ))
+PATH_TARGET := $(abspath $(PATH_TARGET))
+PATH_INS    := $(abspath $(PATH_INS))
+PATH_BIN    := $(abspath $(PATH_BIN))
+PATH_DLL    := $(abspath $(PATH_DLL))
+PATH_SYS    := $(abspath $(PATH_SYS))
+PATH_LIB    := $(abspath $(PATH_LIB))
+PATH_DOC    := $(abspath $(PATH_DOC))
 
 
@@ -884 +901 @@
 
 
-
 # end-of-file-content
 __header_kmk__ := 1