Changeset 2510 in kBuild

Timestamp:

Jul 24, 2011 7:56:44 PM (13 years ago)

Author:

bird

Message:

footer.kmk: Link _INST/_STAGE props should be treated as filenames when no trailing slash is present.

File:

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

trunk/kBuild/footer.kmk

@@ -1337 +1337 @@
         definst )
  $(target)_1_STAGE := $(stage)
- $(target)_1_STAGE_TARGET := $(addprefix $(PATH_STAGE)/,$(addsuffix $(notdir $(out)),$(stage)))
+ if "$(substr $(stage),-1,1)" == "/" || "$(stage)" == ""
+  $(target)_1_STAGE_TARGET := $(addprefix $(PATH_STAGE)/,$(addsuffix $(notdir $(out)),$(stage)))
+ else
+  $(target)_1_STAGE_TARGET := $(addprefix $(PATH_STAGE)/,$(stage))
+ endif
 else
  $(target)_1_STAGE :=
@@ -1355 +1359 @@
         definst )
  $(target)_1_INST := $(inst)
- $(target)_1_INST_TARGET := $(addprefix $(PATH_INS)/,$(addsuffix $(notdir $(out)),$(stage)))
+ if "$(substr $(inst),-1,1)" == "/" || "$(inst)" == ""
+  $(target)_1_INST_TARGET := $(addprefix $(PATH_INS)/,$(addsuffix $(notdir $(out)),$(inst)))
+ else
+  $(target)_1_INST_TARGET := $(addprefix $(PATH_INS)/,$(inst))
+ endif
 else
  $(target)_1_INST :=