55 lines
1.9 KiB
Plaintext
55 lines
1.9 KiB
Plaintext
From 76e6dc11fcd26cc0deeb7df151f0520f526b57ff Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Sat, 9 Nov 2013 02:25:02 +0100
|
|
Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables
|
|
|
|
* /boot/common has been removed in Haiku.
|
|
* USRBIN_PATH is /system/bin.
|
|
* UNIXCCS_PATH: The installation directory for binutils/gcc has
|
|
changed.
|
|
* DEVTOOLS_PATH: Match the comment. Tools like zip etc. live in
|
|
/system/bin.
|
|
|
|
diff --git a/make/common/shared/Defs-haiku.gmk b/make/common/shared/Defs-haiku.gmk
|
|
index 8cb87d5..f642cfd 100644
|
|
--- a/make/common/shared/Defs-haiku.gmk
|
|
+++ b/make/common/shared/Defs-haiku.gmk
|
|
@@ -57,7 +57,6 @@ endef
|
|
USRJDKINSTANCES_PATH =/opt/java
|
|
|
|
BOOTSYSTEMBIN_PATH = $(shell finddir B_SYSTEM_BIN_DIRECTORY)/
|
|
-BOOTCOMMONBIN_PATH = $(shell finddir B_COMMON_BIN_DIRECTORY)/
|
|
BOOTSYSTEMDEVELOP_PATH = $(shell finddir B_SYSTEM_DEVELOP_DIRECTORY)/
|
|
|
|
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
|
|
@@ -73,7 +72,7 @@ endif
|
|
ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
|
|
USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
|
|
else
|
|
- USRBIN_PATH = $(BOOTCOMMONBIN_PATH)
|
|
+ USRBIN_PATH = $(BOOTSYSTEMBIN_PATH)
|
|
endif
|
|
|
|
# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
|
|
@@ -81,7 +80,7 @@ endif
|
|
ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
|
|
UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
|
|
else
|
|
- UNIXCCS_PATH = $(BOOTSYSTEMDEVELOP_PATH)/tools/gnupro/
|
|
+ UNIXCCS_PATH = $(BOOTSYSTEMBIN_PATH)/tools/
|
|
endif
|
|
|
|
# SLASH_JAVA: location of all network accessable files
|
|
@@ -103,7 +102,7 @@ endif
|
|
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
|
|
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
|
|
else
|
|
- DEVTOOLS_PATH =$(BOOTSYSTEMDEVELOP_PATH)/tools/gnupro/bin/
|
|
+ DEVTOOLS_PATH =$(BOOTSYSTEMBIN_PATH)
|
|
endif
|
|
|
|
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
|
|
--
|
|
1.8.3.4
|
|
|