Changeset 2240 in kBuild

Timestamp:

Jan 9, 2009 3:48:32 AM (16 years ago)

Author:

bird

Message:

subheader.kmk,subfooter.kmk: Fixed double expansion bug in previous revision.

Location:

trunk/kBuild

Files:

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

trunk/kBuild/subfooter.kmk

@@ -42 +42 @@
 # Set the default path for all new targets.
 #
+## @todo use $(evalval ) instead of doubly expanded $(eval )?
 define def_subheader
  ifndef $(target)_PATH
   ifdef $(target)_DEFPATH
-   $(target)_PATH := $($(target)_DEFPATH)
+   $(target)_PATH := $$($(target)_DEFPATH)
   else
-   $(target)_PATH := $(PATH_SUB_CURRENT)
-   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+   $(target)_PATH := $$(PATH_SUB_CURRENT)
+   $(target)_DEFPATH := $$(PATH_SUB_CURRENT)
   endif
  else ifndef $(target)_DEFPATH
-  $(target)_DEFPATH := $($(target)_PATH)
+  $(target)_DEFPATH := $$($(target)_PATH)
  endif
  ifndef $(target)_MAKEFILE
-  $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
+  $(target)_MAKEFILE := $$(MAKEFILE_CURRENT)
  endif
  ifndef $(target)_0_OUTDIR
-  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
-  PATH_$(target) := $($(target)_0_OUTDIR)
+  $(target)_0_OUTDIR := $$(call TARGET_PATH,$(target))
+  PATH_$(target) := $$($(target)_0_OUTDIR)
  endif
 endef

trunk/kBuild/subheader.kmk

@@ -53 +53 @@
  # Set the default path and makefile for all new targets.
  #
+ ## @todo use $(evalval ) instead of doubly expanded $(eval )?
  define def_subfooter
   ifndef $(target)_PATH
    ifdef $(target)_DEFPATH
-    $(target)_PATH := $($(target)_DEFPATH)
+    $(target)_PATH := $$($(target)_DEFPATH)
    else
-    $(target)_PATH := $(PATH_SUB_CURRENT)
-    $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+    $(target)_PATH := $$(PATH_SUB_CURRENT)
+    $(target)_DEFPATH := $$(PATH_SUB_CURRENT)
    endif
   else ifndef $(target)_DEFPATH
-   $(target)_DEFPATH := $($(target)_PATH)
+   $(target)_DEFPATH := $$($(target)_PATH)
   endif
   ifndef $(target)_MAKEFILE
@@ -68 +69 @@
   endif
   ifndef $(target)_0_OUTDIR
-   $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
-   PATH_$(target) := $($(target)_0_OUTDIR)
+   $(target)_0_OUTDIR := $$(call TARGET_PATH,$(target))
+   PATH_$(target) := $$($(target)_0_OUTDIR)
   endif
  endef