Commit f7867154 authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent a8f97b39
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment