Changeset 2529 for trunk/kBuild/footer-pass2-installs.kmk

Timestamp:

Aug 2, 2011, 12:07:51 PM (14 years ago)

Author:

bird

Message:

footer-pass2-installs.kmk: Avoid adding an unnecessary ./ to the symlink target.

File:

• trunk/kBuild/footer-pass2-installs.kmk (modified) (4 diffs)

trunk/kBuild/footer-pass2-installs.kmk

@@ -259 +259 @@
 local symlnk := $(firstword $(symdst))
 local symdst := $(word $(words $(symdst)),$(symdst))
+local symlnkdir := $(dir $(symlnk))
+ifeq ($(symlnkdir),./)
+ local symlnkdir :=
+endif
 
 # Figure which install function to use below.
@@ -269 +273 @@
 # Calc stage destination and generate the rule (requires double evaluation).
 local stage      := $(strip $(firstdefined $(symlnk)_STAGE $(symlnk)_INST $(target)_1_STAGE,value))
+$(info stage:=$(stage))
 if "$(substr $(stage),-1)" != "/" && "$(stage)" != ""
  $(warning kBuild: Symlink $(symlnk) in install target $(target) has a STAGE/INST property without a trailing slash: '$(stage)')
  local stage     := $(stage)/
 endif
-local stage      := $(stage)$(dir $(symlnk))
+local stage      := $(stage)$(symlnkdir)
 ifeq ($(root $(stage)),)
  local stagedst  := $(call $(instfun),$(symlnk),$(target),$(stage),$(PATH_STAGE))
@@ -299 +304 @@
   $(error kBuild: Symlink $(symlnk) in install target $(target) has a INST property with an absolute path: '$(inst)')
  endif
- local inst    := $(inst)$(dir $(symlnk))
+ local inst    := $(inst)$(symlnkdir)
  local instdst := $(call $(instfun),$(symlnk),$(target),$(inst),$(PATH_INS))
  $(eval $(def_install_symlink_rule_installing))
@@ -305 +310 @@
 endif
 
-#$(warning symlnk=$(symlnk) symdst=$(symdst) instdst=$(instdst) stagedst=$(stagedst) instfun=$(instfun) inst=$(inst) stage='$(stage)')
+$(warning symlnk=$(symlnk) symdst=$(symdst) instdst=$(instdst) stagedst=$(stagedst) instfun=$(instfun) inst=$(inst) stage='$(stage)')
 endef # def_install_symlink
 $(optmize def_install_symlink)