Changeset 1390 for trunk/kBuild

Timestamp:

Feb 3, 2008, 10:53:30 PM (18 years ago)

Author:

bird

Message:

Fixed bug when DEPTH == SUB_DEPTH which caused CURSUBDIR = PATH_SUB_ROOT because patsubst failed (no trailing slash). The result would be lots of werid stuff, esp. on windows. The actual caused was a mixup of PATH_CURRENT and PATH_SUB_ROOT in the test trying to avoid the issue.

File:

• trunk/kBuild/header.kmk (modified) (1 diff)

trunk/kBuild/header.kmk

@@ -269 +269 @@
 ## CURSUBDIR is PATH_SUB_ROOT described relative to PATH_ROOT.
 # This variable is used to determin where the object files and other output goes.
-ifneq ($(PATH_ROOT),$(PATH_CURRENT))
-CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_ROOT))
-else
-CURSUBDIR           := .
+ifneq ($(PATH_ROOT),$(PATH_SUB_ROOT))
+ CURSUBDIR          := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_ROOT))
+else
+ CURSUBDIR          := .
 endif