texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Gavin D. Smith
Date: Thu, 24 Oct 2024 07:24:31 -0400 (EDT)

branch: master
commit f46bacb6eecef0cc6361606a34af155419f6e164
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 24 12:19:57 2024 +0100

    * README-hacking, configure.ac, tp/Texinfo/XS/configure.ac:
    Move all instructions for upgrading gettext to README-hacking.
---
 ChangeLog                  |  5 +++++
 README-hacking             | 14 +++++++++++---
 configure.ac               |  9 ++-------
 tp/Texinfo/XS/configure.ac |  8 +-------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5704786b67..384613cb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-10-24  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * README-hacking, configure.ac, tp/Texinfo/XS/configure.ac:
+       Move all instructions for upgrading gettext to README-hacking.
+
 2024-10-24  Gavin Smith <gavinsmith0123@gmail.com>
 
        * NEWS: mention gettext version
diff --git a/README-hacking b/README-hacking
index cf0ea17866..6075241b1e 100644
--- a/README-hacking
+++ b/README-hacking
@@ -344,10 +344,18 @@ check at latest automake/autoconf/gettext/help2man 
version:
     if gettextize makes too many changes that need to be reverted, try
       autopoint -f --dry-run
       autopoint -f
-    check that this does not actually downgrade files due to files also
-    being updated from gnulib --add-import.  check for duplicate files
+    run "git status -u" to check for new files.  revert or remove any
+    *.m4 files that downgrade from a newer serial number (from gnulib)
+    to an older serial number (from gettext).  check for duplicate files
     under build-aux/m4 and gnulib/m4.
-  . also upgrade gettext under tp/Texinfo/XS using autopoint and/or gettextize
+
+    see http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html
+    for some hints.
+
+  . also upgrade gettext under tp/Texinfo/XS.  run:
+      gettextize -f --po-dir=../../../po --no-changelog
+     and then revert any unwanted changes and remove any unwanted new files.
+
   . After upgrading automake/autoconf/gettext, run ./autogen.sh
     and/or "autoreconf --verbose --force --install" to update ancilliary
     files in build-aux and elsewhere.  Check changes before committing.
diff --git a/configure.ac b/configure.ac
index d381f6ab22..b998d09d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,13 +425,8 @@ AC_ARG_WITH([external-Text-Unidecode],
 AC_SUBST([USE_UNICODE])
 AC_SUBST([USE_EXTERNAL_UNIDECODE])
 
-# i18n support.  To upgrade to a new version of gettext, run:
-#   gettextize -f --po-dir=po --po-dir=po_document
-# To fetch the *.m4 files without upgrading, run:
-#   autopoint -f
-# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
-# newer serial number (from gnulib) to an older serial number (from gettext).
-# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
+# i18n support.
+# See README-hacking for how to upgrade to a new version of gettext
 AM_GNU_GETTEXT_VERSION([0.22.5])
 AM_GNU_GETTEXT([external])
 
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 6353c2c52c..ed8949b8be 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -176,14 +176,8 @@ gl_EARLY
 # i18n support.  We need to use the same GNU gettext version as the main
 # configure.ac file since the version of the gettext.m4 and related files
 # must be in sync with the Makefile.in.in in the shared po/ directory.
+# See the README-hacking file at top level for how to upgrade gettext.
 #
-# To upgrade to a new version of gettext, run:
-#   gettextize -f --po-dir=../../../po --no-changelog
-# To fetch the *.m4 files without upgrading, run:
-#   autopoint -f; rm -rf po
-# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
-# newer serial number (from gnulib) to an older serial number (from gettext).
-# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
 AM_GNU_GETTEXT_VERSION([0.22.5])
 AM_GNU_GETTEXT([external])
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]