Changeset 729 for trunk/kBuild/subheader.kmk

Timestamp:

Dec 17, 2006, 3:12:07 AM (19 years ago)

Author:

bird

Message:

The target _PATH property should be working now.

File:

• trunk/kBuild/subheader.kmk (modified) (2 diffs)

trunk/kBuild/subheader.kmk

@@ -25 +25 @@
 #
 
-ifndef _SUB_MAKEFILE_STACK
+ifndef _SUB_MAKEFILE_NOT_FIRST
+
  #
  # The first time we just take the makefile context set by header.kmk.
  #
+ _SUB_MAKEFILE_NOT_FIRST := 1
  include $(PATH_KBUILD)/header.kmk
-
+ 
 else
 
@@ -63 +65 @@
  # Switch context.
  #
+
+ # push the current old makefile onto the stack.
+ $(call stack-push,_SUB_MAKEFILE_STACK,$(MAKEFILE_CURRENT))
+
+ # the current makefile is the 2nd from the end of the MAKEFILE_LIST (we're the last one).
  __tmp := $(MAKEFILE_LIST)
  $(call stack-popv,__tmp)
  MAKEFILE_CURRENT := $(call stack-top,__tmp)
- PATH_SUB_CURRENT := $(abspath $(patsubst %/,%,$(dir $(MAKEFILE_CURRENT))))
+ PATH_SUB_CURRENT := $(abspath $(dir $(MAKEFILE_CURRENT)))
 endif
 
-$(call stack-push,_SUB_MAKEFILE_STACK,$(MAKEFILE_CURRENT))
-