Changeset 2518 in kBuild

Timestamp:

Jul 26, 2011 12:08:37 PM (13 years ago)

Author:

bird

Message:

footer.kmk: Bugfixes to the previous changes.

File:

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

trunk/kBuild/footer.kmk

@@ -1570 +1570 @@
  endif
  ifneq ($(root $(stage)),)
-  $(error kBuild: The INST property should not start with a root specification)
+  $(error kBuild: The effective INST property of install '$(target)' should not start with a root specification)
  endif
  $(target)_1_INST := $(inst)
@@ -3040 +3040 @@
 local srcdst    := $(word $(words $(srcdst)),$(srcdst))
 
-# instfun, mode, uid and gid
+# instfun, mode, uid and gid.
 ifdef $(srcsrc)_INSTFUN
  local instfun := $(srcsrc)_INSTFUN
@@ -3139 +3139 @@
  local stagedst  := $(call $(instfun),$(srcdst),$(target),$(stage),$(PATH_STAGE))
 else
- local stage     := $(abspath $(stage))
+ local stage     := $(abspath $(stage))/
  ifeq ($(pos $(PATH_OBJ),$(stage)),1)
-  local stage    := $(substr $(stage), 1, $(length-var PATH_OBJ))
+  local stage    := $(substr $(stage), $(expr $(length-var PATH_OBJ) + 2))
   local stagedst := $(call $(instfun),$(srcdst),$(target),$(stage),$(PATH_OBJ))
  else
@@ -3243 +3243 @@
  local stagedst  := $(call $(instfun),$(symlnk),$(target),$(stage),$(PATH_STAGE))
 else
- local stage     := $(abspath $(stage))
+ local stage     := $(abspath $(stage))/
  ifeq ($(pos $(PATH_OBJ),$(stage)),1)
-  local stage    := $(substr $(stage), 1, $(length-var PATH_OBJ))
+  local stage    := $(substr $(stage), $(expr $(length-var PATH_OBJ) + 2))
   local stagedst := $(call $(instfun),$(symlnk),$(target),$(stage),$(PATH_OBJ))
  else
@@ -3343 +3343 @@
  local insdst  := $(PATH_STAGE)/$(stage)$(directory)/
 else
- local stage   := $(abspath $(stage))
+ local stage   := $(abspath $(stage))/
  ifeq ($(pos $(PATH_OBJ),$(stage)),1)
   local insdst := $(stage)$(directory)/