[haiku-commits] haiku: hrev47393 - /
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 16 Jun 2014 21:13:38 +0200 (CEST)
hrev47393 adds 1 changeset to branch 'master'
old head: 6229115bacb6fe085dcef68cbde071632e05bb68
new head: e6d5152f7efe1e397232592f9cd4a5c3dcea924c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e6d5152+%5E6229115
----------------------------------------------------------------------------
e6d5152: Make all directories overridable by environment.
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47393
Commit: e6d5152f7efe1e397232592f9cd4a5c3dcea924c
URL: http://cgit.haiku-os.org/haiku/commit/?id=e6d5152
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Mon Jun 16 19:01:07 2014 UTC
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 8 deletions(-)
Jamrules | 16 ++++++++--------
----------------------------------------------------------------------------
diff --git a/Jamrules b/Jamrules
index 9c02e79..fb4eaf7 100644
--- a/Jamrules
+++ b/Jamrules
@@ -2,17 +2,17 @@
# Main directories used by the build.
HAIKU_OUTPUT_DIR ?= [ FDirName
$(HAIKU_TOP) generated ] ;
-HAIKU_BUILD_OUTPUT_DIR = [ FDirName
$(HAIKU_OUTPUT_DIR) build ] ;
-HAIKU_BUILD_DIR = [ FDirName
$(HAIKU_TOP) build ] ;
-HAIKU_BUILD_RULES_DIR = [ FDirName $(HAIKU_BUILD_DIR)
jam ] ;
-HAIKU_OBJECT_DIR = [ FDirName
$(HAIKU_OUTPUT_DIR)
+HAIKU_BUILD_OUTPUT_DIR ?= [ FDirName
$(HAIKU_OUTPUT_DIR) build ] ;
+HAIKU_BUILD_DIR ?= [ FDirName
$(HAIKU_TOP) build ] ;
+HAIKU_BUILD_RULES_DIR ?= [ FDirName
$(HAIKU_BUILD_DIR) jam ] ;
+HAIKU_OBJECT_DIR ?= [ FDirName
$(HAIKU_OUTPUT_DIR)
objects ] ;
-HAIKU_CATALOGS_OBJECT_DIR = [ FDirName $(HAIKU_OBJECT_DIR)
+HAIKU_CATALOGS_OBJECT_DIR ?= [ FDirName
$(HAIKU_OBJECT_DIR)
catalogs ] ;
-HAIKU_COMMON_PLATFORM_OBJECT_DIR = [ FDirName $(HAIKU_OBJECT_DIR) common
] ;
-HAIKU_DOWNLOAD_DIR = [ FDirName
$(HAIKU_OUTPUT_DIR)
+HAIKU_COMMON_PLATFORM_OBJECT_DIR ?= [ FDirName $(HAIKU_OBJECT_DIR)
common ] ;
+HAIKU_DOWNLOAD_DIR ?= [ FDirName
$(HAIKU_OUTPUT_DIR)
download ] ;
-HAIKU_OPTIONAL_BUILD_PACKAGES_DIR = [ FDirName $(HAIKU_OUTPUT_DIR)
+HAIKU_OPTIONAL_BUILD_PACKAGES_DIR ?= [ FDirName $(HAIKU_OUTPUT_DIR)
build_packages ] ;
# Cache files for header scanning and jamfile caching
Other related posts:
- » [haiku-commits] haiku: hrev47393 - / - zooey
