Changeset 472 for trunk/kBuild/header.kmk

Timestamp:

Jul 15, 2006, 6:33:50 AM (19 years ago)

Author:

bird

Message:

New feature: Sub-Makefile.

File:

• trunk/kBuild/header.kmk (modified) (3 diffs)

trunk/kBuild/header.kmk

@@ -248 +248 @@
 #
 ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
+
 PATH_CURRENT        := $(abspath $(CURDIR))
+ifneq ($(strip $(SUB_DEPTH)),)
+PATH_SUB_CURRENT    := $(abspath $(PATH_CURRENT)/$(SUB_DEPTH))
+else
+PATH_SUB_CURRENT    := $(PATH_CURRENT)
+endif
 PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
 
@@ -254 +260 @@
 
 PATH_CURRENT        := $(CURDIR)
-# Get the real root path.
+PATH_SUB_CURRENT    := $(PATH_CURRENT)
+ifneq ($(strip $(SUB_DEPTH)),)
+ifneq ($(SUB_DEPTH),.)
+$(foreach d,$(subst /, ,$(SUB_DEPTH)), $(eval PATH_SUB_CURRENT := $(patsubst %/,%,$(dir $(PATH_SUB_CURRENT)))) )
+endif
+endif
 PATH_ROOT           := $(PATH_CURRENT)
 ifneq ($(DEPTH),.)
@@ -261 +272 @@
 
 endif
+
 # Subdirectory relative to the root.
 ifneq ($(PATH_ROOT),$(PATH_CURRENT))
-CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_CURRENT))
+CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_CURRENT))
 else
 CURSUBDIR           := .