i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert unrelated changes from previous commit.

Browse Source 
I should have read the update script more closely as to
how it added changes for committing...
This commit is contained in:
Augustin Cavalier
2018-08-13 15:58:01 -04:00
parent 5924b6e410
commit 20c61bb7a4
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+1 -1
View File
@@ -61,7 +61,7 @@ HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ;
HAIKU_DEFAULT_INSTALL_DIR = /Haiku ;
HAIKU_DEFAULT_IMAGE_SIZE ?= 500 ; # 300 MB
HAIKU_DEFAULT_IMAGE_SIZE ?= 300 ; # 300 MB
HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ;
# Haiku CD defaults
build/jam/LocaleRules
+2 -1
View File
@@ -73,7 +73,8 @@ rule ExtractCatalogEntries target : sources : signature : regexp
actions ExtractCatalogEntries1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-)" > "$(1)".pre | true
cat "$(2[2-])" \
| $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre
$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
-w -o "$(1)" "$(1)".pre
}