mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix install program detection

Browse Source 
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.
This commit is contained in:
Peter Eisentraut 2012-06-27 21:21:18 +03:00
parent a8f97b39c7
commit f786715412
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -693,6 +693,7 @@ MKDIR_P
AWK AWK
LN_S LN_S
TAR TAR
INSTALL_
INSTALL_DATA INSTALL_DATA
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_PROGRAM 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 # a relative path to it in each makefile where it subsitutes it. This clashes
# with our Makefile.global concept. This workaround helps. # with our Makefile.global concept. This workaround helps.
case $INSTALL in case $INSTALL in
*install-sh*) INSTALL='';; *install-sh*) INSTALL_='';;
*) INSTALL_=$INSTALL;;
esac esac
# Extract the first word of "tar", so it can be a program name with args. # Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2 set dummy tar; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4
configure.in
View File

@ -814,8 +814,10 @@ AC_PROG_INSTALL
# a relative path to it in each makefile where it subsitutes it. This clashes # a relative path to it in each makefile where it subsitutes it. This clashes
# with our Makefile.global concept. This workaround helps. # with our Makefile.global concept. This workaround helps.
case $INSTALL in case $INSTALL in
*install-sh*) INSTALL='';; *install-sh*) INSTALL_='';;
*) INSTALL_=$INSTALL;;
esac esac
AC_SUBST(INSTALL_)
AC_PATH_PROG(TAR, tar) AC_PATH_PROG(TAR, tar)
AC_PROG_LN_S AC_PROG_LN_S

2
src/Makefile.global.in
View File

@ -290,7 +290,7 @@ BZIP2 = bzip2
# Installation. # Installation.
install_sh = $(SHELL) $(top_srcdir)/config/install-sh -c 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_SCRIPT_MODE = 755
INSTALL_DATA_MODE = 644 INSTALL_DATA_MODE = 644