Changeset 2511 in kBuild

Timestamp:

Jul 25, 2011 9:04:27 AM (14 years ago)

Author:

bird

Message:

footer.kmk: Another link target install fix.

File:

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

trunk/kBuild/footer.kmk

@@ -1337 +1337 @@
         definst )
  $(target)_1_STAGE := $(stage)
- if "$(substr $(stage),-1,1)" == "/" || "$(stage)" == ""
+ if "$(substr $(stage),-1,1)" == "/" # Multicast support requires addprefix/suffix.
   $(target)_1_STAGE_TARGET := $(addprefix $(PATH_STAGE)/,$(addsuffix $(notdir $(out)),$(stage)))
+ else if "$(stage)" == ""
+  $(target)_1_STAGE_TARGET := $(PATH_STAGE)/$(notdir $(out))
  else
   $(target)_1_STAGE_TARGET := $(addprefix $(PATH_STAGE)/,$(stage))
@@ -1359 +1361 @@
         definst )
  $(target)_1_INST := $(inst)
- if "$(substr $(inst),-1,1)" == "/" || "$(inst)" == ""
+ if "$(substr $(inst),-1,1)" == "/" # Multicast support requires addprefix/suffix.
   $(target)_1_INST_TARGET := $(addprefix $(PATH_INS)/,$(addsuffix $(notdir $(out)),$(inst)))
+ else if "$(inst)" == ""
+  $(target)_1_INST_TARGET := $(PATH_INS)/$(notdir $(out))
  else
   $(target)_1_INST_TARGET := $(addprefix $(PATH_INS)/,$(inst))