Changeset 1457 in kBuild

Timestamp:

Mar 30, 2008 9:30:53 PM (17 years ago)

Author:

bird

Message:

Fixed another template loading bug.

File:

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

trunk/kBuild/footer.kmk

@@ -548 +548 @@
 # Load it.
 ifneq ($(load_function),)
- loading := $(trg)
+ loading := $(patsubst $(src_prefix)%,%,$(trg))
  $(eval $(value $(load_function)))
 endif
@@ -628 +628 @@
 # @param loading    The template name. This is prefixed.
 define def_templates_load_function
-loading := $(patsubst TEMPLATE_%,%,$(loading))
 ifndef TEMPLATE_$(loading)
  TEMPLATE_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_TEMPLATE_PATHS) $(PATH_KBUILD)/templates $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
@@ -640 +639 @@
 endif
 endef # def_templates_load_function
-$(foreach loading, $(addprefix TEMPLATE_,$(_TEMPLATES)), $(eval $(value def_templates_load_function)))
+$(foreach loading, $(_TEMPLATES), $(eval $(value def_templates_load_function)))