Changeset 3613 in kBuild for trunk/src/sed/po/Makefile.in.in

Timestamp:

Sep 19, 2024 12:34:43 AM (7 months ago)

Author:

bird

Message:

src/sed: Merged in changes between 4.1.5 and 4.9 from the vendor branch. (svn merge ^{/vendor/sed/4.1.5} /vendor/sed/current .)

Location:

trunk/src/sed

Files:

• . (modified) (1 prop)
• po/Makefile.in.in (modified) (19 diffs)

trunk/src/sed/po/Makefile.in.in

@@ -1 +1 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <[email protected]>
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <[email protected]>
 #
 # This file can be copied and used freely without restrictions.  It can
@@ -8 +8 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
-
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
@@ -21 +26 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
@@ -43 +68 @@
 UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in Makevars \
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
@@ -53 +78 @@
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .nop .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-        $(MSGFMT) -c -o $@ $<
+        @echo "$(MSGFMT) -c -o $@ $<"; \
+        $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
         @lang=`echo $* | sed -e 's,.*/,,'`; \
         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po
+        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+        sed -e '/^#/d' $< > t-$@
+        mv t-$@ $@
 
 
 all: all-@USE_NLS@
 
-all-yes: $(CATALOGS)
+all-yes: stamp-po
 all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+        test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+          || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+               exit 1; \
+             }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+        @$(CHECK_MACRO_VERSION)
+        test ! -f $(srcdir)/$(DOMAIN).pot || \
+          test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+        @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+          echo "touch stamp-po" && \
+          echo timestamp > stamp-poT && \
+          mv stamp-poT stamp-po; \
+        }
 
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -77 +148 @@
 # have been downloaded.
 
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
-        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-          --files-from=$(srcdir)/POTFILES.in \
-          --copyright-holder='$(COPYRIGHT_HOLDER)' \
-        && test ! -f $(DOMAIN).po \
-           || ( rm -f $(srcdir)/$(DOMAIN).pot \
-                && mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot )
-
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+        package_gnu="$(PACKAGE_GNU)"; \
+        test -n "$$package_gnu" || { \
+          if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+                 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+                               -size -10000000c -exec grep 'GNU @PACKAGE@' \
+                               /dev/null '{}' ';' 2>/dev/null; \
+               else \
+                 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+               fi; \
+             } | grep -v 'libtool:' >/dev/null; then \
+             package_gnu=yes; \
+           else \
+             package_gnu=no; \
+           fi; \
+        }; \
+        if test "$$package_gnu" = "yes"; then \
+          package_prefix='GNU '; \
+        else \
+          package_prefix=''; \
+        fi; \
+        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+        else \
+          msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+        fi; \
+        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+              --files-from=$(srcdir)/POTFILES.in \
+              --copyright-holder='$(COPYRIGHT_HOLDER)' \
+              --msgid-bugs-address="$$msgid_bugs_address" \
+            ;; \
+          *) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+              --files-from=$(srcdir)/POTFILES.in \
+              --copyright-holder='$(COPYRIGHT_HOLDER)' \
+              --package-name="$${package_prefix}@PACKAGE@" \
+              --package-version='@VERSION@' \
+              --msgid-bugs-address="$$msgid_bugs_address" \
+            ;; \
+        esac
+        test ! -f $(DOMAIN).po || { \
+          if test -f $(srcdir)/$(DOMAIN).pot; then \
+            sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+            sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+            if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+              rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+            else \
+              rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+              mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+            fi; \
+          else \
+            mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+          fi; \
+        }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
 $(srcdir)/$(DOMAIN).pot:
         $(MAKE) $(DOMAIN).pot-update
 
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(POFILESDEPS)
         @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-        cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
+        if test -f "$(srcdir)/$${lang}.po"; then \
+          test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
+          test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+          echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+          cd $(srcdir) \
+            && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+                   '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+                     $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+                   *) \
+                     $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+                 esac; \
+               }; \
+        else \
+          $(MAKE) $${lang}.po-create; \
+        fi
 
 
@@ -99 +242 @@
 install-exec:
 install-data: install-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext"; then \
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-          for file in $(DISTFILES.common); do \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+          for file in $(DISTFILES.common) Makevars.template; do \
             $(INSTALL_DATA) $(srcdir)/$$file \
                             $(DESTDIR)$(gettextsrcdir)/$$file; \
+          done; \
+          for file in Makevars; do \
+            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
           done; \
         else \
@@ -110 +256 @@
 install-data-no: all
 install-data-yes: all
-        $(mkinstalldirs) $(DESTDIR)$(datadir)
         @catalogs='$(CATALOGS)'; \
         for cat in $$catalogs; do \
@@ -116 +261 @@
           lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
           dir=$(localedir)/$$lang/LC_MESSAGES; \
-          $(mkinstalldirs) $(DESTDIR)$$dir; \
+          $(mkdir_p) $(DESTDIR)$$dir; \
           if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
           $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
@@ -155 +300 @@
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext"; then \
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
         else \
           : ; \
@@ -162 +307 @@
 installdirs-data-no:
 installdirs-data-yes:
-        $(mkinstalldirs) $(DESTDIR)$(datadir)
         @catalogs='$(CATALOGS)'; \
         for cat in $$catalogs; do \
@@ -168 +312 @@
           lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
           dir=$(localedir)/$$lang/LC_MESSAGES; \
-          $(mkinstalldirs) $(DESTDIR)$$dir; \
+          $(mkdir_p) $(DESTDIR)$$dir; \
           for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
             if test -n "$$lc"; then \
@@ -200 +344 @@
 uninstall-exec:
 uninstall-data: uninstall-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext"; then \
-          for file in $(DISTFILES.common); do \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          for file in $(DISTFILES.common) Makevars.template; do \
             rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
           done; \
@@ -220 +364 @@
 check: all
 
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
-        rm -f core core.* $(DOMAIN).po *.new.po
+        rm -f remove-potcdate.sed
+        rm -f stamp-poT
+        rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
         rm -fr *.o
 
@@ -234 +380 @@
         @echo "This command is intended for maintainers to use;"
         @echo "it deletes files that may require special tools to rebuild."
-        rm -f $(GMOFILES)
+        rm -f stamp-po $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-        $(MAKE) update-po
+        test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
         dists="$(DISTFILES)"; \
-        if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          dists="$$dists Makevars.template"; \
+        fi; \
+        if test -f $(srcdir)/$(DOMAIN).pot; then \
+          dists="$$dists $(DOMAIN).pot stamp-po"; \
+        fi; \
+        if test -f $(srcdir)/ChangeLog; then \
+          dists="$$dists ChangeLog"; \
+        fi; \
+        for i in 0 1 2 3 4 5 6 7 8 9; do \
+          if test -f $(srcdir)/ChangeLog.$$i; then \
+            dists="$$dists ChangeLog.$$i"; \
+          fi; \
+        done; \
         if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
         for file in $$dists; do \
           if test -f $$file; then \
-            cp -p $$file $(distdir); \
+            cp -p $$file $(distdir) || exit 1; \
           else \
-            cp -p $(srcdir)/$$file $(distdir); \
+            cp -p $(srcdir)/$$file $(distdir) || exit 1; \
           fi; \
         done
@@ -255 +414 @@
 update-po: Makefile
         $(MAKE) $(DOMAIN).pot-update
-        $(MAKE) $(UPDATEPOFILES)
+        test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
         $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+        @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+        echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+        exit 1
 
 # General rule for updating PO files.
@@ -262 +428 @@
 .nop.po-update:
         @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-        if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
         tmpdir=`pwd`; \
         echo "$$lang:"; \
         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+        echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
         cd $(srcdir); \
-        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+        if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+               '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+                 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+               *) \
+                 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+             esac; \
+           }; then \
           if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
             rm -f $$tmpdir/$$lang.new.po; \
@@ -289 +461 @@
         @:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
         cd $(top_builddir) \
-          && CONFIG_FILES=$(subdir)/[email protected] CONFIG_HEADERS= \
-               $(SHELL) ./config.status
+          && @SHELL@ ./config.status $(subdir)/[email protected] po-directories
 
 force:
@@ -299 +474 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
+install-dvi:;
+install-ps:;
+install-pdf:;
+install-html:;