[haiku-commits] r39109 - in haiku/trunk: build/jam src/apps/screenshot
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 24 Oct 2010 03:21:07 +0200 (CEST)
Author: mmadia
Date: 2010-10-24 03:21:07 +0200 (Sun, 24 Oct 2010)
New Revision: 39109
Changeset: http://dev.haiku-os.org/changeset/39109
Ticket: http://dev.haiku-os.org/ticket/6741
Modified:
haiku/trunk/build/jam/LocaleRules
haiku/trunk/src/apps/screenshot/Jamfile
Log:
Updated DoCatalogs rule, to apply a grist based on the target's signature and
not based on the automatic path-based grist. This (in conjunction with passing
a value for the 'folder' parameter) allows multiple targets within the same
source directory to have their own catalog files.
Fixes #6741.
Modified: haiku/trunk/build/jam/LocaleRules
===================================================================
--- haiku/trunk/build/jam/LocaleRules 2010-10-24 01:16:36 UTC (rev 39108)
+++ haiku/trunk/build/jam/LocaleRules 2010-10-24 01:21:07 UTC (rev 39109)
@@ -128,7 +128,7 @@
HAIKU_CATALOGS_SUBDIR on $(signature) = $(subdir) ;
local generatedCatalog
- = [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ;
+ = $(sourceLanguage:G=$(signature):E=en:S=.catalog) ;
MakeLocate $(generatedCatalog)
: [ FDirName $(HAIKU_CATALOGS_OBJECT_DIR) $(subdir) ] ;
Modified: haiku/trunk/src/apps/screenshot/Jamfile
===================================================================
--- haiku/trunk/src/apps/screenshot/Jamfile 2010-10-24 01:16:36 UTC (rev
39108)
+++ haiku/trunk/src/apps/screenshot/Jamfile 2010-10-24 01:21:07 UTC (rev
39109)
@@ -29,4 +29,7 @@
x-vnd.haiku-screenshot-cli
:
Utility.cpp
+ :
+ :
+ : cli
;
Other related posts:
- » [haiku-commits] r39109 - in haiku/trunk: build/jam src/apps/screenshot - mattmadia
