diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-17 18:21:04 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-17 18:21:04 +0100 |
| commit | 4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe (patch) | |
| tree | 7f69880f86968333be277861c509b501a53c3972 /m4 | |
| parent | 9042530473b52251a4022cc0a0e02636b9a53211 (diff) | |
| parent | 3f9fc60baa2e7f9324e17a26f592e92148b7117c (diff) | |
| download | automake-4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe.tar.gz | |
Merge branch 'minor'
* minor:
Fix dumb logic error preventing $install_sh from being be overridden
Automake docs: fix typos and use of British English
Expose automake bug#19311
build: fix race in parallel builds
build: fix race in parallel builds
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/install-sh.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4 index 094c10a85..16a3d9c33 100644 --- a/m4/install-sh.m4 +++ b/m4/install-sh.m4 @@ -10,7 +10,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |