Fix install program detection

configure handles INSTALL as a substitution variable specially, and
apparently it gets confused when it's set to empty.  Use INSTALL_
instead as a workaround to avoid the issue.

diff --git a/configure b/configure
index fd2977020512db7fa4f384267a1f3dbf33c7f060..1661be7d29f98563feb6f067b0bd04f4852401a4 100755 (executable)
--- a/configure
+++ b/configure
@@ -693,6 +693,7 @@ MKDIR_P
 AWK
 LN_S
 TAR
+INSTALL_
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -6955,9 +6956,11 @@ 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-sh*) INSTALL_='';;
+  *) INSTALL_=$INSTALL;;
 esac
 
+
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

diff --git a/configure.in b/configure.in
index 01869305b914bf13e851871cc5e620d134dfd035..5e5318b9b7e81f59968fc0089e3ded5433c3ab7d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -814,8 +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-sh*) INSTALL_='';;
+  *) INSTALL_=$INSTALL;;
 esac
+AC_SUBST(INSTALL_)
 
 AC_PATH_PROG(TAR, tar)
 AC_PROG_LN_S

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 97dea8a0581096b1e8ba494b60d26dddb4e97319..1e61e73b0dfd887c75758de1a7bb0b17676eb467 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -290,7 +290,7 @@ BZIP2   = bzip2
 # Installation.
 
 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),$(or @INSTALL_@,$(install_sh)))
 
 INSTALL_SCRIPT_MODE    = 755
 INSTALL_DATA_MODE  = 644