From 7f9fc20afa3bcff007da941041ceb0c0d84d8fc3 Mon Sep 17 00:00:00 2001 From: Vencislav Atanasov Date: Sun, 28 Jul 2019 19:44:23 +0300 Subject: Use full_path_subst on more places, to avoid replacing the wrong occurrences in paths. If ROOTDIR=/rockbox and BUILDDIR=/rockbox/build-something, it is now possible to successfully build both target binaries and simulators. Change-Id: If12d1d5933c5a15feebf627a4f1636dc1e3a67fa --- apps/plugins/plugins.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/plugins/plugins.make') diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index be3d35717e..d395c00e82 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -22,7 +22,7 @@ PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES) endif OTHER_SRC += $(PLUGINS_SRC) ROCKS1 := $(PLUGINS_SRC:.c=.rock) -ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1)) +ROCKS1 := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(ROCKS1)) ROCKS := $(ROCKS1) @@ -35,7 +35,7 @@ OTHER_SRC += $(PLUGINLIB_SRC) PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o) PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) -PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) +PLUGINLIB_OBJ := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PLUGINLIB_OBJ)) ### build data / rules ifndef APP_TYPE -- cgit