From patchwork Tue Apr 26 22:45:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Foley X-Patchwork-Id: 734781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3QMkxnd023632 for ; Tue, 26 Apr 2011 22:46:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759060Ab1DZWqW (ORCPT ); Tue, 26 Apr 2011 18:46:22 -0400 Received: from nd215.dnsexit.com ([64.182.102.215]:58651 "EHLO box7.911domain.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759020Ab1DZWqS (ORCPT ); Tue, 26 Apr 2011 18:46:18 -0400 Received: from mail.foleyremote.com (pool-108-28-47-43.washdc.fios.verizon.net [108.28.47.43]) (authenticated bits=0) by box7.911domain.com (8.13.8/8.13.8) with ESMTP id p3QMkThO010662 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 26 Apr 2011 18:46:30 -0400 X-Complaints-To: abuse@dnsExit.com X-SPAM: Please report Spam to abuse@dnsExit.com By service at http://www.dnsExit.com/Direct.sv?cmd=mailRelay Accounts will be suspended immediately if convicted Spam Received: from [192.168.1.21] (192.168.1.21) by EXCHANGE.foleyremote.com (192.168.1.5) with Microsoft SMTP Server (TLS) id 14.1.270.1; Tue, 26 Apr 2011 18:45:38 -0400 Message-ID: <4DB74B11.1010200@verizon.net> Date: Tue, 26 Apr 2011 18:45:37 -0400 From: Peter Foley Reply-To: User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-Version: 1.0 To: CC: , Michal Marek , Arnaud Lacombe Subject: [PATCH V2 5/7] kbuild: make update-po-config work in KBUILD_OUTPUT Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 26 Apr 2011 22:47:00 +0000 (UTC) This patch makes update-po-config work when make is invoked in KBUILD_OUTPUT. Signed-off-by: Peter Foley --- scripts/kconfig/Makefile | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) # Extract gconf menu items for I18N support $(obj)/gconf.glade.h: $(obj)/gconf.glade - intltool-extract --type=gettext/glade $(obj)/gconf.glade + intltool-extract --type=gettext/glade --srcdir=$(srctree) \ + $(obj)/gconf.glade ### # The following requires flex/bison/gperf diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index eacdefb..4507336 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf # The symlink is used to repair a deficiency in arch/um update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h $(Q)echo " GEN config" - $(Q)xgettext --default-domain=linux \ - --add-comments --keyword=_ --keyword=N_ \ - --from-code=UTF-8 \ - --files-from=scripts/kconfig/POTFILES.in \ + $(Q)xgettext --default-domain=linux \ + --add-comments --keyword=_ --keyword=N_ \ + --from-code=UTF-8 \ + --files-from=$(srctree)/scripts/kconfig/POTFILES.in \ + --directory=$(srctree) --directory=$(objtree) \ --output $(obj)/config.pot $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch - $(Q)(for i in `ls arch/*/Kconfig`; \ + $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`; \ do \ echo " GEN $$i"; \ $(obj)/kxgettext $$i \ @@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h done ) $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ --output $(obj)/linux.pot - $(Q)rm -f arch/um/Kconfig.arch + $(Q)rm -f $(srctree)/arch/um/Kconfig.arch $(Q)rm -f $(obj)/config.pot PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig @@ -331,7 +332,8 @@ $(obj)/lkc_defs.h: $(src)/lkc_proto.h