Further fix install program detection

The $(or) make function was introduced in GNU make 3.81, so the
previous coding didn't work in 3.80.  Write it differently, and
improve the variable naming to make more sense in the new coding.

diff --git a/configure b/configure
index 1661be7d29f98563feb6f067b0bd04f4852401a4..acec60c3a7ab18ba6b1d5d2a474c3346bf3664fc 100755 (executable)
--- a/configure
+++ b/configure
@@ -693,7 +693,7 @@ MKDIR_P
 AWK
 LN_S
 TAR
-INSTALL_
+install_bin
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -6956,8 +6956,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # a relative path to it in each makefile where it subsitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
-  *install-sh*) INSTALL_='';;
-  *) INSTALL_=$INSTALL;;
+  *install-sh*) install_bin='';;
+  *) install_bin=$INSTALL;;
 esac
 
 

diff --git a/configure.in b/configure.in
index 5e5318b9b7e81f59968fc0089e3ded5433c3ab7d..05e6324e8f1fe6e10a5beaf0d1fdb36334d89799 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -814,10 +814,10 @@ AC_PROG_INSTALL
 # a relative path to it in each makefile where it subsitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
-  *install-sh*) INSTALL_='';;
-  *) INSTALL_=$INSTALL;;
+  *install-sh*) install_bin='';;
+  *) install_bin=$INSTALL;;
 esac
-AC_SUBST(INSTALL_)
+AC_SUBST(install_bin)
 
 AC_PATH_PROG(TAR, tar)
 AC_PROG_LN_S

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 1e61e73b0dfd887c75758de1a7bb0b17676eb467..3941d969b8680ef71af043505f0cacda5b9af9ab 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -289,8 +289,9 @@ BZIP2       = bzip2
 
 # Installation.
 
+install_bin = @install_bin@
 install_sh = $(SHELL) $(top_srcdir)/config/install-sh -c
-INSTALL = $(if $(use_install_sh),$(install_sh),$(or @INSTALL_@,$(install_sh)))
+INSTALL = $(if $(use_install_sh),$(install_sh),$(if $(install_bin),$(install_bin),$(install_sh)))
 
 INSTALL_SCRIPT_MODE    = 755
 INSTALL_DATA_MODE      = 644