[haiku-commits] haiku: hrev47672 - data/develop
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 13 Aug 2014 08:06:24 +0200 (CEST)
hrev47672 adds 1 changeset to branch 'master'
old head: b59ed154866f94ab50fa95d10327dc9987d370e0
new head: 6288f7b4537703bfaa43bf8f8fa0c58e4c8dd82b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6288f7b+%5Eb59ed15
----------------------------------------------------------------------------
6288f7b: Allow rdefs in subdirectories in makefile-engine.
Also use finddir instead of hardcoded paths for drivers and locale
catalog helper rules.
Fixes #11115. Thanks to Waddlesplash and Puckipedia for investigating
the issue.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47672
Commit: 6288f7b4537703bfaa43bf8f8fa0c58e4c8dd82b
URL: http://cgit.haiku-os.org/haiku/commit/?id=6288f7b
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Aug 13 06:05:13 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/11115
----------------------------------------------------------------------------
1 file changed, 9 insertions(+), 6 deletions(-)
data/develop/makefile-engine | 15 +++++++++------
----------------------------------------------------------------------------
diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine
index 8e74f8d..bc7ded6 100644
--- a/data/develop/makefile-engine
+++ b/data/develop/makefile-engine
@@ -140,8 +140,8 @@ endef
OBJS = $(SRCS_LIST_TO_OBJS)
DEPENDS = $(SRCS_LIST_TO_DEPENDS)
-# create a unique list of paths to our sourcefiles
-SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file))))
+# create a unique list of paths to our sourcefiles and resources
+SRC_PATHS += $(sort $(foreach file, $(SRCS) $(RSRCS) $(RDEFS), $(dir $(file))))
# add source paths to VPATH if not already present
VPATH :=
@@ -351,8 +351,8 @@ rmapp ::
-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,10 +369,13 @@ else
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 :
Other related posts:
- » [haiku-commits] haiku: hrev47672 - data/develop - pulkomandy
