From 85cf9e37d65dff373ffd7000c3eb043d0b1df665 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 24 Oct 2010 01:21:07 +0000 Subject: [PATCH] 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 --- build/jam/LocaleRules | 2 +- src/apps/screenshot/Jamfile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules index 68a310598f..a0c5e5721c 100644 --- a/build/jam/LocaleRules +++ b/build/jam/LocaleRules @@ -128,7 +128,7 @@ rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder 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) ] ; diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile index 97a21b8d56..dea306acef 100644 --- a/src/apps/screenshot/Jamfile +++ b/src/apps/screenshot/Jamfile @@ -29,4 +29,7 @@ DoCatalogs screenshot : x-vnd.haiku-screenshot-cli : Utility.cpp + : + : + : cli ;