From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id A6E2D1F5A0 for ; Sun, 5 Feb 2023 16:25:01 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=clisp.org header.i=@clisp.org header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=JMB2wBm5; dkim-atps=neutral Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOhop-0006ci-5v; Sun, 05 Feb 2023 11:24:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOhon-0006cP-Mc for bug-gnulib@gnu.org; Sun, 05 Feb 2023 11:24:41 -0500 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOhol-0002Wt-4L for bug-gnulib@gnu.org; Sun, 05 Feb 2023 11:24:41 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1675614263; cv=none; d=strato.com; s=strato-dkim-0002; b=WDZg6YpOpk/phdXyTsyS7vDmwVykI5KsuIXeNzjcSGafI0LBOFNvXGbkAgE02mN9w5 ju2W4hgGTciCrEbmC6CoMhX/WOF+ZQV2Ri66NKRwBLEqlGrpcLjRi0oCPIL364wOpTQC 4CWYb3CDMc+s2eYLSBAQLhh7zE2nLT+7PAA6FEmeC4pgkKF5IweewFjO5J4iK5E+z/vO HOj+Yr9f4/Jz13VaaOMdE53vDrMcd0XvMT0AVaqTrWclPig7996u/ps90s2IyIIgEE4C Rp+AStSp200Y5BYB+tZK8LbTTMqiM7QF6DWC9bsaHMLIoegi5xRxX20n4ZMwcHVkF1oG Wxsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1675614263; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=vP9+WR/9SnTv6ErwE0ojZRBmH1jVbvAUEhPgcMTO71E=; b=r/wL2lQeh4mWaixgeRm4Yw2T3os5he7Vx0Y2MQhm94CRDQXDI/MBBQFzlzf/t8HNA6 /Zu2TwmP1EmH8gp5Pa5ZkjF645yndrr7RBnIcXC/MT45904JO4BPavM+qFcSb10LsJmt hl5S1phypb3oqKIcLjrt/zOWCuf1nVEuqromqmMvl0+nka5SF4q9gPjYLjb/2NjelsD6 qgD1KRNdSUD/blo1jwTyBzt9B7ge4AbGg/git1/fWG57ucp6d05ZGXCORBc3wnCuAa+R tw6hMcI5BlhYtD+dGtx9ucb82aJhZhBYG3LrEHLkp54aSp3NTKVXigORlvWpDDC3flyV BI+A== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1675614263; s=strato-dkim-0002; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=vP9+WR/9SnTv6ErwE0ojZRBmH1jVbvAUEhPgcMTO71E=; b=JMB2wBm5jZfVT90gaSs8255hDnGMi/6Cr+8HQdjfGCpmLT32W/aul+XaJIPCW3k3zm LXVo5KQ/lCshkMDR0CDYoI9TDtbRGlN0VTXy/SWmHJwdgLRQNacxU3jzTLRcUXg0xi8H +cnXO1MefPETj7FJg8G5XbIEMhF2IA5izLY3DdSC4eeTgWhsnmVPthKYapTSrlW642px GkKLkEYjwbe/1xlEN7sLpxk6lxH2ArEU+YSM8zvpuE9VD3lwwiApbstX+yF3sYlIukjJ WVpkKyVH2fMAKG06yaqG2soR4TlI70yi7pnFvz+44XjNZG32pGdg8KV++VOmpCME1dpH HFhg== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpPAivaVgZEELrmCMft3NLH+1kGMug==" Received: from nimes.localnet by smtp.strato.de (RZmta 49.2.2 AUTH) with ESMTPSA id 098542z15GOM5DF (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 5 Feb 2023 17:24:22 +0100 (CET) From: Bruno Haible To: Reuben Thomas , bug-gnulib@gnu.org Cc: Paul Eggert Subject: Re: build-aux/po/Makefile.in.in needs updating Date: Sun, 05 Feb 2023 17:24:22 +0100 Message-ID: <18706334.SfH6JfJWFI@nimes> In-Reply-To: <05902195-8d7a-20e3-5d95-3211ce4cbc5e@cs.ucla.edu> References: <05902195-8d7a-20e3-5d95-3211ce4cbc5e@cs.ucla.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=85.215.255.22; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Reuben Thomas wrote: > > Bruno pointed out to me that there's a bug fixed in the Makfile.in.in from > > gettext 0.20.2, which postdates the 0.20 version found in gnulib. (The bug > > is that the Makefile.in.in has prerequisites on suffix rules, which are > > ignored.) Done. See below. Paul Eggert wrote: > In Gnulib I'd normally run 'config/srclist-update to propagate stuff from other projects into Gnulib, but Bruno typically > does Gettext-related stuff by hand so srclist-update doesn't do that. I do it by hand because it should be synced with the latest GNU gettext release that is compatible with the current 'gettext' module. Syncing with the contents of the git repo would bear major risks. 2023-02-05 Bruno Haible Update build-aux/po/Makefile.in.in. Reported by Reuben Thomas in . * build-aux/po/Makefile.in.in: Sync from GNU gettext 0.21.1. Fixes: - In the .po -> .gmo rules, consider the newest changes to the POT file. - Emit a warning when creating a tarball without POT file. diff --git a/build-aux/po/Makefile.in.in b/build-aux/po/Makefile.in.in index c2cf0491b9..6b25f0d916 100644 --- a/build-aux/po/Makefile.in.in +++ b/build-aux/po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper -# Copyright (C) 2000-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2020 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.20 +# Origin: gettext-0.21 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -90,6 +90,9 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) # Makevars gets inserted here. (Don't remove this line!) +all: all-@USE_NLS@ + + .SUFFIXES: .SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update @@ -107,7 +110,8 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) # the .pot file. This eliminates the need to update the .po files when the # .pot file has changed, which would be troublesome if the .po files are put # under version control. -.po.gmo: $(srcdir)/$(DOMAIN).pot +$(GMOFILES): $(srcdir)/$(DOMAIN).pot +.po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \ @@ -123,8 +127,6 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) mv t-$@ $@ -all: all-@USE_NLS@ - all-yes: $(srcdir)/stamp-po all-no: @@ -413,12 +415,17 @@ dist distdir: @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: $(srcdir)/stamp-po $(DISTFILES) - dists="$(DISTFILES)"; \ + @dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ + else \ + case $(XGETTEXT) in \ + :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \ + *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \ + esac; \ fi; \ if test -f $(srcdir)/ChangeLog; then \ dists="$$dists ChangeLog"; \