Changeset 1754 in kBuild for trunk

Timestamp:

Sep 6, 2008 3:23:03 AM (16 years ago)

Author:

bird

Message:

footer.kmk: Gave install targets a directory in the object tree, e.i. a PATH_<target> property, like the rest.

File:

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

trunk/kBuild/footer.kmk

@@ -1483 +1483 @@
 local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
 # TARGET_*
-TARGET_$(target) := $(PATH_TARGET)/$(target).ins
+TARGET_$(target)  := $(PATH_TARGET)/$(target).ins
 # INSTARGET_ later.
-endef
+# PATH_*
+local outbase     := $(call TARGET_BASE,$(target),$(target))
+PATH_$(target)    := $(patsubst %/,%,$(dir $(outbase)))
+endef # def_pass1_install
 $(foreach target, $(_ALL_INSTALLS), \
         $(evalval def_pass1_install))
@@ -3214 +3217 @@
 INSTARGET_$(target) := $($(target)_GOALS)
 INSTARGET_DIRS_$(target) :=
+local outbase := $(call TARGET_BASE,$(target),$(target))
+ifndef PATH_$(target)
+ PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
+else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
+ $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
+endif
 
 local clean_files := $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type))
@@ -3237 +3246 @@
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
 _CLEAN_FILES += $(clean_files)
-_DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
+_DIRS += $(PATH_$(target)) $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
 endef