doc: Don't expose generated version

* gettext-tools/doc/Makefile.am ($(srcdir)/stamp-vti): Set
ARCHIVE-VERSION, derived from $(ARCHIVE_VERSION) in version.texi.
* gettext-tools/doc/gettext.texi (Files under Version Control): Refer to
ARCHIVE-VERSION, instead of VERSION.
* gettext-tools/doc/autopoint.texi: Refer to ARCHIVE-VERSION, instead of VERSION.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index ebe67437283b24fc6fc099165020fe675fa01740..ed80a4a682ea165a33098b4d2927f764bb93a9c5 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,12 @@
+2015-10-06  Daiki Ueno  <ueno@gnu.org>
+
+       doc: Don't expose generated version
+       * Makefile.am ($(srcdir)/stamp-vti): Set ARCHIVE-VERSION, derived
+       from $(ARCHIVE_VERSION) in version.texi.
+       * gettext.texi (Files under Version Control): Refer to
+       ARCHIVE-VERSION, instead of VERSION.
+       * autopoint.texi: Refer to ARCHIVE-VERSION, instead of VERSION.
+
 2015-09-11  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.6 released.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 0abb43f8078170128745e6a6b6514b1f66771d11..fed7fd63d887ef442f9627715e68a55717385617 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -78,7 +78,8 @@ $(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.vers
        echo "@set UPDATED $$1 $$2 $$3"; \
        echo "@set UPDATED-MONTH $$2 $$3"; \
        echo "@set EDITION $(VERSION)"; \
-       echo "@set VERSION $(VERSION)") > vti.tmp
+       echo "@set VERSION $(VERSION)"; \
+       echo "@set ARCHIVE-VERSION $(ARCHIVE_VERSION)") > vti.tmp
        cmp -s vti.tmp version.texi \
          || (echo "Updating version.texi"; \
              cp vti.tmp version.texi)

diff --git a/gettext-tools/doc/autopoint.texi b/gettext-tools/doc/autopoint.texi
index 7934cf029128d9f093b24e4b600bf7c2db00df8e..264bd7880d7cdc30a2828210e22591276d87b9f5 100644 (file)
--- a/gettext-tools/doc/autopoint.texi
+++ b/gettext-tools/doc/autopoint.texi
@@ -13,10 +13,10 @@ this version into the package.
 
 To extract the latest available infrastructure which satisfies a version
 requirement, then you can use the form
-@code{AM_GNU_GETTEXT_REQUIRE_VERSION(@var{version})} instead.  For example, if
-gettext @value{VERSION} is installed on your system and @code{0.19.1} is
-requested, then the infrastructure files of version @value{VERSION} will
-be copied into a source package.
+@code{AM_GNU_GETTEXT_REQUIRE_VERSION(@var{version})} instead.  For
+example, if gettext @value{ARCHIVE-VERSION} is installed on your system
+and @code{0.19.1} is requested, then the infrastructure files of version
+@value{ARCHIVE-VERSION} will be copied into a source package.
 
 @subsubsection Options
 
@@ -50,10 +50,11 @@ Output version information and exit.
 
 @end table
 
-@code{autopoint} supports the GNU @code{gettext} versions from 0.10.35 to
-the current one, @value{VERSION}.  In order to apply @code{autopoint} to
-a package using a @code{gettext} version newer than @value{VERSION}, you
-need to install this same version of GNU @code{gettext} at least.
+@code{autopoint} supports the GNU @code{gettext} versions from 0.10.35
+to the current one, @value{ARCHIVE-VERSION}.  In order to apply
+@code{autopoint} to a package using a @code{gettext} version newer than
+@value{ARCHIVE-VERSION}, you need to install this same version of GNU
+@code{gettext} at least.
 
 In packages using GNU @code{automake}, an invocation of @code{autopoint}
 should be followed by invocations of @code{aclocal} and then @code{autoconf}

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 6dda6635cf6fcc228a05f404bd1b794945b49dbb..81d2bca931bbd8817ba18df932987df45e0cfa4e 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -8780,7 +8780,7 @@ adds to the @file{configure.ac} or @file{configure.in} a line of the
 form
 
 @example
-AM_GNU_GETTEXT_VERSION(@value{VERSION})
+AM_GNU_GETTEXT_VERSION(@value{ARCHIVE-VERSION})
 @end example
 
 @noindent