Merge branch 'minor'next

6 files changed, 42 insertions, 14 deletions

diff --git a/HACKING b/HACKING
index 0fa3ac356..21dab2a74 100644
--- a/HACKING
+++ b/HACKING
@@ -274,6 +274,12 @@
       ... removed in commit 'v1.11-1674-g02e9072' of 01-01-2012,
       "dist: ditch support for lzma"...
 
+* If the commit is a tiny change that is exempt from copyright paperwork, the
+  commit message should contain a separate line after the detailed list of
+  touched files like the following:
+
+      Copyright-paperwork-exempt: yes
+
 ============================================================================
 = Test suite
 
diff --git a/NEWS b/NEWS
index 2eea830fa..2b4803f71 100644
--- a/NEWS
+++ b/NEWS
@@ -191,6 +191,14 @@ New in ?.?.?:
   - Installed 'aclocal' m4 macros can now accept installation directories
     containing '@' characters (automake bug#20903)
 
+  - When combining AC_LIBOBJ or AC_FUNC_ALLOCA with the
+    "--disable-dependency-tracking" configure option in an out of source
+    build, the build sub-directory defined by AC_CONFIG_LIBOBJ_DIR is now
+    properly created.  (automake bug#27781)
+
+  - The time printed by 'mdate-sh' is now using the UTC time zone to support
+    the reproducible build effort.  (automake bug#20314)
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.15.1:
diff --git a/bin/automake.in b/bin/automake.in
index 4a7bc1203..6621302d8 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2229,13 +2229,15 @@ sub handle_lib_objects
   return $seen_libobjs;
 }
 
-# handle_LIBOBJS_or_ALLOCA ($VAR)
-# -------------------------------
+# handle_LIBOBJS_or_ALLOCA ($VAR, $BASE)
+# --------------------------------------
 # Definitions common to LIBOBJS and ALLOCA.
 # VAR should be one of LIBOBJS, LTLIBOBJS, ALLOCA, or LTALLOCA.
+# BASE should be one base file name from AC_LIBSOURCE, or alloca.
 sub handle_LIBOBJS_or_ALLOCA
 {
-  my ($var) = @_;
+  my ($var, $base) = @_;
+
   my $dir = '';
 
   # If LIBOBJS files must be built in another directory we have
@@ -2253,9 +2255,18 @@ sub handle_LIBOBJS_or_ALLOCA
       $dir = backname ($relative_dir) . "/$dir"
         if $relative_dir ne '.';
       define_variable ('LIBOBJDIR', "$dir", INTERNAL);
-      $clean_files{"\$($var)"} = MOSTLY_CLEAN;
-      # libtool might create LIBOBJS as a side-effect of using LTLIBOBJS.
-      $clean_files{"\$(LIBOBJS)"} = MOSTLY_CLEAN if $var eq "LTLIBOBJS";
+      if ($dir && !defined $clean_files{"$dir$base.\$(OBJEXT)"})
+	{
+	  my $dirstamp = require_build_directory ($dir);
+	  $output_rules .= "$dir$base.\$(OBJEXT): $dirstamp\n";
+	  $output_rules .= "$dir$base.lo: $dirstamp\n"
+	    if ($var =~ /^LT/);
+	}
+      # libtool might create .$(OBJEXT) as a side-effect of using
+      # LTLIBOBJS or LTALLOCA.
+      $clean_files{"$dir$base.\$(OBJEXT)"} = MOSTLY_CLEAN;
+      $clean_files{"$dir$base.lo"} = MOSTLY_CLEAN
+	if ($var =~ /^LT/);
     }
 
   return $dir;
@@ -2270,14 +2281,14 @@ sub handle_LIBOBJS
   $var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
     if ! keys %libsources;
 
-  my $dir = handle_LIBOBJS_or_ALLOCA "${lt}LIBOBJS";
-
   foreach my $iter (keys %libsources)
     {
-      if ($iter =~ /\.[cly]$/)
+      my $dir = '';
+      if ($iter =~ /^(.*)(\.[cly])$/)
 	{
-	  saw_extension ($&);
+	  saw_extension ($2);
 	  saw_extension ('.c');
+	  $dir = handle_LIBOBJS_or_ALLOCA ("${lt}LIBOBJS", $1);
 	}
 
       if ($iter =~ /\.h$/)
@@ -2305,7 +2316,7 @@ sub handle_ALLOCA
   my ($var, $cond, $lt) = @_;
   my $myobjext = $lt ? 'lo' : 'o';
   $lt ||= '';
-  my $dir = handle_LIBOBJS_or_ALLOCA "${lt}ALLOCA";
+  my $dir = handle_LIBOBJS_or_ALLOCA ("${lt}ALLOCA", "alloca");
 
   $dir eq '' and $dir = './';
   $var->requires_variables ("\@${lt}ALLOCA\@ used", $lt . 'ALLOCA');
diff --git a/lib/mdate-sh b/lib/mdate-sh
index b9db8ca59..6dd5b21e7 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2017-09-16.17; # UTC
+scriptversion=2017-09-19.11; # UTC
 
 # Copyright (C) 1995-2017 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
@@ -74,6 +74,10 @@ export LC_ALL
 LC_TIME=C
 export LC_TIME
 
+# Use UTC to get reproducible result.
+TZ=UTC
+export TZ
+
 # GNU ls changes its time format in response to the TIME_STYLE
 # variable.  Since we cannot assume 'unset' works, revert this
 # variable to its documented default.
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 9bd75b91e..2982a8f5d 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2017-09-16.10}
+\def\texinfoversion{2017-09-19.13}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 13ba619a6..d234aef48 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -38,7 +38,6 @@ t/override-conditional-pr13940.sh \
 t/dist-pr109765.sh \
 t/instdir-cond2.sh \
 t/java-nobase.sh \
-t/libobj-no-dependency-tracking.sh \
 t/objext-pr10128.sh \
 t/remake-timing-bug-pr8365.sh \
 t/lex-subobj-nodep.sh \