From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 26 Dec 2013 20:01:30 +0000 (+0100)
Subject: Merge branch 'minor'
X-Git-Tag: v1.16~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd31e3434f0d676817177395126e4afd2c928f19;p=thirdparty%2Fautomake.git

Merge branch 'minor'

* minor:
  Allow user to extend .PRECIOUS target
  cosmetics: remove a couple of extra trailing white spaces
  tests: fix a spurious failure on Mac OS X
  docs: make clear the JAVA primary is frozen
  install-sh: a slightly better diagnostic, and tests enhancements
  install-sh: be stricter in catching invalid usages
  tests: more significant names for some tests
  tests: some cosmetic fixes
  tests: more significant names for a test
  docs: drop a few obsolescent FIXME/TODO comments, and associated text
  testsuite harness: report test exit status in log file
  TAP driver: no need to invoke AC_PROG_AWK directly
  TAP driver: remove perl implementation (move it into contrib/)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

bd31e3434f0d676817177395126e4afd2c928f19
diff --cc m4/init.m4
index 06605a613,05ad294fc..7a285ef00
--- a/m4/init.m4
+++ b/m4/init.m4
@@@ -87,10 -85,16 +87,10 @@@ AM_MISSING_PROG([MAKEINFO], [makeinfo]
  AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
  AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
 -# For better backward compatibility.  To be removed once Automake 1.9.x
 -# dies out for good.  For more background, see:
 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 -AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+ # We need awk for the "check" target (and possibly the TAP driver).  The
+ # system "awk" is bad on some platforms.
  AC_REQUIRE([AC_PROG_AWK])dnl
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 -AC_REQUIRE([AM_SET_LEADING_DOT])dnl
  _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
  	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
  			     [_AM_PROG_TAR([v7])])])
diff --cc t/list-of-tests.mk
index 1a21f1cf9,a9694d816..dfbf3e293
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -512,15 -512,14 +512,15 @@@ t/help-silent.sh 
  t/help-upc.sh \
  t/hfs.sh \
  t/implicit.sh \
 +t/includes-deprecation.sh \
  t/init.sh \
  t/init2.sh \
- t/insh2.sh \
- t/install2.sh \
+ t/dist-install-sh.sh \
+ t/dist-with-unreadable-makefile-fails.sh \
  t/installdir.sh \
- t/instsh.sh \
- t/instsh2.sh \
- t/instsh3.sh \
+ t/add-missing-install-sh.sh \
+ t/install-sh-unittests.sh \
+ t/install-sh-option-C.sh \
  t/instdat.sh \
  t/instdat2.sh \
  t/instdir.sh \