[haiku-commits] haiku: hrev52539 - build/jam

  • From: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 16 Nov 2018 21:50:45 -0500 (EST)

hrev52539 adds 1 changeset to branch 'master'
old head: 3db452372c187ff50208c380d2184fd813cec23a
new head: 53ce162d3d9a3824ba9149d52741b712d6e2745c
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=53ce162d3d9a+%5E3db452372c18

----------------------------------------------------------------------------

53ce162d3d9a: Revert "RepositoryRules: Use absolute output path for bootstrap 
package,mimeset,mimedb"
  
  * Nope.  Double generated directories when bootstrap run from HAIKU_TOP
  * Third time's a charm?
  
  This reverts commit 3db452372c187ff50208c380d2184fd813cec23a.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52539
Commit:      53ce162d3d9a3824ba9149d52741b712d6e2745c
URL:         https://git.haiku-os.org/haiku/commit/?id=53ce162d3d9a
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sat Nov 17 02:49:36 2018 UTC

----------------------------------------------------------------------------

1 file changed, 3 insertions(+), 3 deletions(-)
build/jam/RepositoryRules | 6 +++---

----------------------------------------------------------------------------

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 5f2adab03e..8db5d7e8e1 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -379,9 +379,9 @@ TREE_PATH="$(HAIKU_REPOSITORY_TREE_PATH)"
 TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)"
 
 DOWNLOAD_IN_PORT_DIRECTORY="yes"
-PACKAGE_COMMAND="$(HAIKU_ABSOLUTE_OUTPUT_DIR)/$(2[1])"
-MIMESET_COMMAND="$(HAIKU_ABSOLUTE_OUTPUT_DIR)/$(2[2])"
-SYSTEM_MIME_DB="$(HAIKU_ABSOLUTE_OUTPUT_DIR)/$(2[3])"
+PACKAGE_COMMAND="$(2[1])"
+MIMESET_COMMAND="$(2[2])"
+SYSTEM_MIME_DB="$(2[3])"
 LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses"
 OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)"
 EOF


Other related posts:

  • » [haiku-commits] haiku: hrev52539 - build/jam - Alexander von Gluck IV