3 files changed, 17 insertions, 2 deletions

diff --git a/apps/bitmaps/bitmaps.make b/apps/bitmaps/bitmaps.make
index 159c31b64f..a8165b9409 100644
--- a/apps/bitmaps/bitmaps.make
+++ b/apps/bitmaps/bitmaps.make
@@ -25,7 +25,7 @@ ifneq ($(strip $(BMP2RB_REMOTENATIVE)),)
 BMP += $(call preprocess, $(BITMAPDIR)/remote_native/SOURCES)
 endif
 
-BMPOBJ = $(BMP:$(ROOTDIR)/%.bmp=$(BUILDDIR)/%.o)
+BMPOBJ = $(call full_path_subst,$(ROOTDIR)/%.bmp,$(BUILDDIR)/%.o,$(BMP))
 
 BMPHFILES = $(BMPINCDIR)/usblogo.h $(BMPINCDIR)/remote_usblogo.h \
         $(BMPINCDIR)/default_icons.h $(BMPINCDIR)/remote_default_icons.h \
diff --git a/tools/functions.make b/tools/functions.make
index 2a26e48bf2..806e1a2f3e 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -73,3 +73,18 @@ ifeq ($(call info),old)
 export info=echo "$$(1)";
 endif
 
+# path substituion can be surprisingly tricky, indeed the following almost
+# always work but not quite:
+#   BMPOBJ = $(BMP:$(ROOTDIR)/%.bmp=$(BUILDDIR)/%.o)
+# indeed if
+#   ROOTDIR=/rockbox
+#   BUILDDIR=/rockbox/build-bla
+# then:
+#   /rockbox/apps/bitmaps/rockboxlogo-bla.bmp -> /rockbox/apps/bitmaps/rockbox/build-blalogo.o
+# this function ensure that this type of problems does not occur
+#
+# usage: $(call full_path_subst,patterm,replacement,text)
+#
+# example: $(call full_path_subst,$(ROOTDIR)/%.bmp,$(BUILDDIR)/%.o,$(BMP))
+NO_MATCH=this_string_will_never_match_anything
+full_path_subst=$(patsubst $(NO_MATCH)/%,%, $(patsubst $(NO_MATCH)/$(1), $(2), $(addprefix $(NO_MATCH)/, $(3))))
diff --git a/tools/root.make b/tools/root.make
index 2deae8cc82..c9f4a2eb65 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -157,7 +157,7 @@ endif # CORE_GCSECTIONS
 OBJ := $(SRC:.c=.o)
 OBJ := $(OBJ:.S=.o)
 OBJ += $(BMP:.bmp=.o)
-OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ))
+OBJ := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(OBJ))
 
 build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO)