Ticket #11115: MakefileEngine.patch

makefile-engine

@@ -140 +140 @@
 OBJS = $(SRCS_LIST_TO_OBJS)
 DEPENDS = $(SRCS_LIST_TO_DEPENDS)
 
-# create a unique list of paths to our sourcefiles
+# create a unique list of paths to our sourcefiles and resources
 SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file))))
+RSRC_PATHS += $(sort $(foreach file, $(RSRCS), $(dir $(file))))
+RDEF_PATHS += $(sort $(foreach file, $(RDEFS), $(dir $(file))))
 
 # add source paths to VPATH if not already present
 VPATH :=
 VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS))))
+VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(RSRC_PATHS))))
+VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(RDEF_PATHS))))
 
 #   SETTING: build the local and system include paths, compose C++ libs
 ifneq (,$(filter $(CPU),x86 x86_64))
@@ -351 +355 @@
     -rm -f $(TARGET)
 
 # make it easy to install drivers for testing
-USER_BIN_PATH = /boot/home/config/add-ons/kernel/drivers/bin
-USER_DEV_PATH = /boot/home/config/add-ons/kernel/drivers/dev
+USER_BIN_PATH := $(shell finddir B_USER_NONPACKAGED_ADDONS_DIRECTORY)/kernel/drivers/bin
+USER_DEV_PATH := $(shell finddir B_USER_NONPACKAGED_ADDONS_DIRECTORY)/kernel/drivers/dev
 
 driverinstall :: default
 ifeq ($(strip $(TYPE)), DRIVER)
@@ -369 +373 @@
     cp $(TARGET) $(INSTALL_DIR)/$(NAME)
 endif
 
+# catalog installation directory
+CATALOG_INSTALL_DIR := $(shell finddir B_USER_NONPACKAGED_DATA_DIRECTORY)/locale/catalogs
+
 #   rule to install localization resources catalogs
 catalogsinstall :: catalogs
-    mkdir -p "/boot/home/config/data/locale/catalogs/$(APP_MIME_SIG)"
-    -cp $(CATALOGS_DIR)/*.catalog /boot/home/config/data/locale/catalogs/$(APP_MIME_SIG)
+    mkdir -p "$(CATALOG_INSTALL_DIR)/$(APP_MIME_SIG)"
+    -cp $(CATALOGS_DIR)/*.catalog "$(CATALOG_INSTALL_DIR)/$(APP_MIME_SIG)"
 
 # alternative way of storing localization catalogs - bind into program executable's resources
 bindcatalogs :