Changeset 306 in kBuild for trunk

Timestamp:

Aug 11, 2005 8:24:19 PM (19 years ago)

Author:

bird

Message:

Use $(abspath ) when possible.

File:

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

trunk/kBuild/header.kmk

@@ -184 +184 @@
 # Common definitions.
 #
+ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
+PATH_CURRENT        := $(abspath $(CURDIR))
+PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
+
+else
+
 PATH_CURRENT        := $(CURDIR)
 # Get the real root path.
@@ -190 +196 @@
 $(foreach d,$(subst /, ,$(DEPTH)), $(eval PATH_ROOT := $(patsubst %/,%,$(dir $(PATH_ROOT)))) )
 endif
+
+endif
 # Subdirectory relative to the root.
-ifneq ($(DEPTH),.)
-CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(CURDIR))
+ifneq ($(PATH_ROOT),$(PATH_CURRENT))
+CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_CURRENT))
 else
 CURSUBDIR           := .
 endif
+
 # Output directories.
 ifndef PATH_OUT_BASE
@@ -224 +233 @@
 ifndef PATH_KBUILD
 PATH_KBUILD         := $(PATH_ROOT)/kBuild
+endif
+ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
+PATH_KBUILD         := $(abspath $(PATH_KBUILD))
 endif
 # kBuild tools
@@ -377 +389 @@
 #
 # @param        $1      The paths to make absolute.
+ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
+ABSPATH = $(abspath $(1))
+else
 ABSPATH = $(foreach path,$(1)\
             ,$(strip $(if $(subst <,,$(firstword $(subst /, ,<$(path)))),\
                       $(if $(patsubst %:,,$(firstword $(subst :,: ,$(path)))),$(PATH_CURRENT)/$(path),$(path)),\
                       $(path))))
+endif
+                                          
 ## DIRDEP - make create directory dependencies.
 #