From 9a2f2467b4c20bc43a2e9ad1ea4a21b59e9ded48 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 16 Sep 2017 17:16:14 -0700 Subject: [PATCH] "time stamp" -> "timestamp", as per POSIX --- bin/autom4te.in | 2 +- bin/autoreconf.in | 8 ++++---- build-aux/git-version-gen | 4 ++-- doc/autoconf.texi | 2 +- doc/install.texi | 2 +- tests/tools.at | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/autom4te.in b/bin/autom4te.in index 964ac1a5..efe3434a 100644 --- a/bin/autom4te.in +++ b/bin/autom4te.in @@ -912,7 +912,7 @@ sub up_to_date ($) # If a file which used to be included is no longer there, then # don't say it's missing (it might no longer be included). But # of course, that causes the output to be outdated (as if the - # time stamp of that missing file was newer). + # timestamp of that missing file was newer). return 0 if ! $file; push @dep, $file; diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 2eaa19ca..2208a7da 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -318,7 +318,7 @@ sub autoreconf_current_directory () # # Always run it. Tracking its sources for up-to-dateness is too # complex and too error prone. The best we can do is avoiding - # nuking the time stamp. + # nuking the timestamp. my $uses_aclocal = 1; # Nevertheless, if aclocal.m4 exists and is not made by aclocal, @@ -353,13 +353,13 @@ sub autoreconf_current_directory () } else { - # Some file systems have sub-second time stamps, and if so we may + # Some file systems have sub-second timestamps, and if so we may # run into trouble later, after we rerun autoconf and set the - # time stamps of input files to be no greater than aclocal.m4, + # timestamps of input files to be no greater than aclocal.m4, # because the time-stamp-setting operation (utime) has a # resolution of only 1 second. Work around the problem by # ensuring that there is at least a one-second window before the - # time stamp of aclocal.m4t in which no file time stamps can + # timestamp of aclocal.m4t in which no file timestamps can # fall. sleep 1; diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 6c56147d..818578f3 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-17.00; # UTC # Copyright (C) 2007-2016 Free Software Foundation, Inc. # @@ -200,7 +200,7 @@ v=`echo "$v" |sed "s/^$prefix//"` # string we're using came from git. I.e., skip the test if it's "UNKNOWN" # or if it came from .tarball-version. if test "x$v_from_git" != x; then - # Don't declare a version "dirty" merely because a time stamp has changed. + # Don't declare a version "dirty" merely because a timestamp has changed. git update-index --refresh > /dev/null 2>&1 dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= diff --git a/doc/autoconf.texi b/doc/autoconf.texi index e5103232..ca5bd79f 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -21219,7 +21219,7 @@ dest-stamp: src Apart from timestamp resolution, there are also differences in handling equal timestamps. HP-UX @command{make} updates targets if it has the -same time stamp as one of its prerequisites, in violation of Posix rules. +same timestamp as one of its prerequisites, in violation of Posix rules. This can cause spurious rebuilds for repeated runs of @command{make}. This in turn can cause @command{make} to fail if it tries to rebuild diff --git a/doc/install.texi b/doc/install.texi index 776eab1e..1b9627d1 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -262,7 +262,7 @@ use an ANSI C compiler: @noindent and if that doesn't work, install pre-built binaries of GCC for HP-UX. -HP-UX @command{make} updates targets which have the same time stamps as +HP-UX @command{make} updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as @command{configure} are involved. Use GNU @command{make} instead. diff --git a/tests/tools.at b/tests/tools.at index ff274d44..f8e50412 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -123,7 +123,7 @@ AT_DATA([file.m4], ]]) AT_CHECK_AUTOM4TE([-o file file.m4]) -# Create a file whose time stamp is in the future. +# Create a file whose timestamp is in the future. # (next year)-01-01 00:01 UTC should always be in the future, # even on slow machines. echo BAD >file @@ -741,7 +741,7 @@ AC_CONFIG_HEADERS(config.h:config.hin) AC_DEFINE(that, "whatever you want.") ]]) -# The test suite goes too fast for the cache time stamps... +# The test suite goes too fast for the cache timestamps... # Pass --force. AT_CHECK_AUTOHEADER([--force], [1], [], [ignore]) @@ -1256,7 +1256,7 @@ AT_CLEANUP # ----------------------------- AT_SETUP([autom4te preselections]) -: ${sleep='sleep 1'} # Command to force different time stamps. +: ${sleep='sleep 1'} # Command to force different timestamps. # If this test should run on FAT file systems and older w32, # then setting $sleep correctly needs to be revisited. -- 2.11.4.GIT