Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39109 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-10-24 01:21:07 +00:00
parent f2b7a266d7
commit 85cf9e37d6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/LocaleRules
View File

@ -128,7 +128,7 @@ rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder
HAIKU_CATALOGS_SUBDIR on $(signature) = $(subdir) ; HAIKU_CATALOGS_SUBDIR on $(signature) = $(subdir) ;
local generatedCatalog local generatedCatalog
= [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ; = $(sourceLanguage:G=$(signature):E=en:S=.catalog) ;
MakeLocate $(generatedCatalog) MakeLocate $(generatedCatalog)
: [ FDirName $(HAIKU_CATALOGS_OBJECT_DIR) $(subdir) ] ; : [ FDirName $(HAIKU_CATALOGS_OBJECT_DIR) $(subdir) ] ;

3
src/apps/screenshot/Jamfile
View File

@ -29,4 +29,7 @@ DoCatalogs screenshot :
x-vnd.haiku-screenshot-cli x-vnd.haiku-screenshot-cli
: :
Utility.cpp Utility.cpp
:
:
: cli
; ;