From a7faa0582237fe521f174266c6f6a0bd8b28316b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
Date: Tue, 3 Aug 2010 14:10:15 +0000
Subject: [PATCH]  * Allow to put the different catalogs for the bin/ directory
 in spearate places in the generated folder.  *  I didn't manage to make it
 work for the translations, however. If someone with better jam knowledge
 could look at it...

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37871 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/LocaleRules | 7 +++++--
 src/bin/Jamfile       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules
index e533373a81..a8bc176a20 100644
--- a/build/jam/LocaleRules
+++ b/build/jam/LocaleRules
@@ -66,6 +66,7 @@ rule ExtractCatalogEntries target : sources : signature : regexp
 actions ExtractCatalogEntries1
 {
 	$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
+	mkdir -p "$(1:D)"
 	cat "$(2[2-])" \
 		| $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre
 	$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
@@ -91,11 +92,12 @@ rule LinkApplicationCatalog target : sources : signature : language
 actions LinkApplicationCatalog1
 {
 	$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
+	mkdir -p "$(1:D)"
 	$(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \
 		-s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
 }
 
-rule DoCatalogs target : signature : sources : sourceLanguage : regexp
+rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder
 {
 	# DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
 	#	[ : <regexp> ]
@@ -112,8 +114,9 @@ rule DoCatalogs target : signature : sources : sourceLanguage : regexp
 	#					the sources. Optional: default is "en".
 	# regexp            The regular expression used to parse the files.
 	#                   Optional: default is matching be_catalog->GetString
+	# folder			Subfolder where to put the generated files. Optional.                  
 
-	local generatedCatalog = [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ;
+	local generatedCatalog = [ FGristFiles $(sourceLanguage:E=en:S=.catalog:D=$(folder)) ] ;
 
 	# generate catkeys file from sources
 	ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index b6c13bd38b..38602903ba 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -218,7 +218,7 @@ StdBinCommands
 DoCatalogs dstcheck :
 	x-vnd.Haiku-cmd-dstconfig
 	: dstcheck.cpp
-	: dstcheck
+	: : : dstcheck
 ;
 
 SubInclude HAIKU_TOP src bin addattr ;