Changeset 1772 in kBuild for trunk

Timestamp:

Sep 8, 2008 2:36:03 AM (16 years ago)

Author:

bird

Message:

subheader/footer: Fixed DEFPATH/PATH property. Either should be usable for a while until PATH is dropped.

Location:

trunk/kBuild

Files:

• subfooter.kmk (modified) (1 diff)
• subheader.kmk (modified) (1 diff)

trunk/kBuild/subfooter.kmk

@@ -44 +44 @@
 define def_subheader
  ifndef $(target)_PATH
-  $(target)_PATH := $(PATH_SUB_CURRENT)
- endif
- ifndef $(target)_DEFPATH
-  $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+  ifdef $(target)_DEFPATH
+   $(target)_PATH := $($(target)_DEFPATH)
+  else
+   $(target)_PATH := $(PATH_SUB_CURRENT)
+  endif
+ else ifndef $(target)_DEFPATH
+  $(target)_DEFPATH := $($(target)_PATH)
  endif
  ifndef $(target)_MAKEFILE

trunk/kBuild/subheader.kmk

@@ -54 +54 @@
  define def_subfooter
   ifndef $(target)_PATH
-   $(target)_PATH := $(PATH_SUB_CURRENT)
-  endif
-  ifndef $(target)_DEFPATH
-   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+   ifdef $(target)_DEFPATH
+    $(target)_PATH := $($(target)_DEFPATH)
+   else
+    $(target)_PATH := $(PATH_SUB_CURRENT)
+   endif
+  else ifndef $(target)_DEFPATH
+   $(target)_DEFPATH := $($(target)_PATH)
   endif
   ifndef $(target)_MAKEFILE