summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--INSTALL6
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac2
-rw-r--r--manual/install.texi4
5 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 554384a60b..541b5e1afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-19 Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac (AC_ARG_ENABLE(timezone-tools)): Tweak help phrasing.
+ * configure: Regenerate.
+ * INSTALL: Regenerate.
+ * manual/install.texi (--disable-timezone-tools): Use @theglibc{}
+ and tweak grammar.
+
2015-10-19 Geoffrey Thomas <geofft@ldpreload.com>
* login/programs/pt_chown.c: Include signal.h
diff --git a/INSTALL b/INSTALL
index ca847e2f9d..ddee6e1969 100644
--- a/INSTALL
+++ b/INSTALL
@@ -129,9 +129,9 @@ will be used, and CFLAGS sets optimization options for the compiler.
'--disable-timezone-tools'
By default, timezone related utilities ('zic', 'zdump', and
- 'tzselect') are installed with glibc. If you are building these
- independently (e.g. by using the 'tzcode' package), then this
- option will allow disabling the install of these too.
+ 'tzselect') are installed with the GNU C Library. If you are
+ building these independently (e.g. by using the 'tzcode' package),
+ then this option will allow disabling the install of these.
Note that you need to make sure the external tools are kept in sync
with the versions that the GNU C Library expects as the data
diff --git a/configure b/configure
index a97ed8cf2b..3285213cb7 100755
--- a/configure
+++ b/configure
@@ -1408,8 +1408,7 @@ Optional Features:
--enable-shared build shared library [default=yes if GNU ld]
--enable-profile build profiled library [default=no]
--disable-timezone-tools
- do not install timezone tools (if using external
- ones) [default=install]
+ do not install timezone tools [default=install]
--enable-hardcoded-path-in-tests
hardcode newly built glibc path in tests
[default=no]
diff --git a/configure.ac b/configure.ac
index 63f5f92260..eba7a15f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,7 @@ AC_ARG_ENABLE([profile],
[profile=no])
AC_ARG_ENABLE([timezone-tools],
AC_HELP_STRING([--disable-timezone-tools],
- [do not install timezone tools (if using external ones) @<:@default=install@:>@]),
+ [do not install timezone tools @<:@default=install@:>@]),
[enable_timezone_tools=$enableval],
[enable_timezone_tools=yes])
AC_SUBST(enable_timezone_tools)
diff --git a/manual/install.texi b/manual/install.texi
index c502446a7c..f940d6572e 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -159,9 +159,9 @@ so that they can be invoked directly.
@item --disable-timezone-tools
By default, timezone related utilities (@command{zic}, @command{zdump},
-and @command{tzselect}) are installed with glibc. If you are building
+and @command{tzselect}) are installed with @theglibc{}. If you are building
these independently (e.g. by using the @samp{tzcode} package), then this
-option will allow disabling the install of these too.
+option will allow disabling the install of these.
Note that you need to make sure the external tools are kept in sync with
the versions that @theglibc{} expects as the data formats may change over