From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH/RFC v3 4/7] Makefile: Don't install Gettext .mo files if NO_GETTEXT Date: Tue, 1 Jun 2010 23:39:54 +0000 Message-ID: <1275435597-4017-5-git-send-email-avarab@gmail.com> References: <1275173125-21010-1-git-send-email-avarab@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Jakub Narebski , Jeff Epler , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jun 02 01:40:50 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OJb4k-0006At-Df for gcvg-git-2@lo.gmane.org; Wed, 02 Jun 2010 01:40:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757507Ab0FAXkb convert rfc822-to-quoted-printable (ORCPT ); Tue, 1 Jun 2010 19:40:31 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:36324 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757449Ab0FAXkV (ORCPT ); Tue, 1 Jun 2010 19:40:21 -0400 Received: by fxm8 with SMTP id 8so1461071fxm.19 for ; Tue, 01 Jun 2010 16:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=QrJTzslo0ifS23X5oyTbqz27KsqmdQtIX5uq/84b0+M=; b=oJKKgbDaYG++bQ0YMfF8HcAji+aiNdmHkoSJ7dkRgaNNX9cVfWBGbNW7j0eRtAEXU9 kdv8DzYxiouTbAaL5G5w5QGWhv/huymfJmgO8bW97koVEZ6lLtmx4n4wTPb9C/WOzH7v GmXWtX654m6PUcW3NFDIhTKFdykD8YXRTWwcg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=eboOVeBEmWA8EI6PT5ANI8laLmNFT5ZZlcpyKn4oLaaf7cpkc/YeFXHZBhyAGRbW4c K3OuP4Kulj4acMX/7NDlkxZ1W8Nk6mnjLwxS3bx6Rt7JTI+QcyVnjiUNpfuz7Ti01bl/ le/yFnMWyD8Cmhp4Z1GJFht8VAirwBlj++Oss= Received: by 10.223.33.218 with SMTP id i26mr7832623fad.58.1275435620284; Tue, 01 Jun 2010 16:40:20 -0700 (PDT) Received: from localhost.localdomain (dslb-188-098-088-194.pools.arcor-ip.net [188.98.88.194]) by mx.google.com with ESMTPS id z12sm49391227fah.9.2010.06.01.16.40.18 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Jun 2010 16:40:19 -0700 (PDT) X-Mailer: git-send-email 1.7.1.248.gb7713.dirty In-Reply-To: <1275173125-21010-1-git-send-email-avarab@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Change the Makefile not to build/install .mo files as part of the default target if NO_GETTEXT=3D1 is given. This was both redundant, and meant that the Perl and Shell programs would use the Gettext strings, since they don't use the git_setup_gettext() function in gettext.c, which is compiled to a stub if NO_GETTEXT=3D1 is set. Reported-by: Jakub Narebski Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 3f0e305..40eb1a2 100644 --- a/Makefile +++ b/Makefile @@ -1891,7 +1891,9 @@ pot: POFILES :=3D $(wildcard po/*.po) MOFILES :=3D $(patsubst po/%.po,share/locale/%/LC_MESSAGES/git.mo,$(PO= =46ILES)) MODIRS :=3D $(patsubst po/%.po,share/locale/%/LC_MESSAGES/,$(POFILES)) +ifndef NO_GETTEXT all:: $(MOFILES) +endif share/locale/%/LC_MESSAGES/git.mo: po/%.po @mkdir -p $(dir $@) $(QUIET_MSGFMT)$(MSGFMT) -o $@ $< @@ -2008,9 +2010,11 @@ install: all $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' +ifndef NO_GETTEXT $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sharedir_SQ)/locale' (cd share && tar cf - locale) | \ (cd '$(DESTDIR_SQ)$(sharedir_SQ)' && umask 022 && tar xof -) +endif $(MAKE) -C templates DESTDIR=3D'$(DESTDIR_SQ)' install ifndef NO_PERL $(MAKE) -C perl prefix=3D'$(prefix_SQ)' DESTDIR=3D'$(DESTDIR_SQ)' ins= tall --=20 1.7.1.248.gb7713.dirty