Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf786715

Browse files
committed
Fix install program detection
configure handles INSTALL as a substitution variable specially, andapparently it gets confused when it's set to empty. Use INSTALL_instead as a workaround to avoid the issue.
1 parenta8f97b3 commitf786715

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

‎configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ MKDIR_P
693693
AWK
694694
LN_S
695695
TAR
696+
INSTALL_
696697
INSTALL_DATA
697698
INSTALL_SCRIPT
698699
INSTALL_PROGRAM
@@ -6955,9 +6956,11 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
69556956
# a relative path to it in each makefile where it subsitutes it. This clashes
69566957
# with our Makefile.global concept. This workaround helps.
69576958
case $INSTALL in
6958-
*install-sh*) INSTALL='';;
6959+
*install-sh*) INSTALL_='';;
6960+
*) INSTALL_=$INSTALL;;
69596961
esac
69606962

6963+
69616964
# Extract the first word of "tar", so it can be a program name with args.
69626965
set dummy tar; ac_word=$2
69636966
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

‎configure.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,10 @@ AC_PROG_INSTALL
814814
# a relative path to it in each makefile where it subsitutes it. This clashes
815815
# with our Makefile.global concept. This workaround helps.
816816
case $INSTALL in
817-
*install-sh*) INSTALL='';;
817+
*install-sh*) INSTALL_='';;
818+
*) INSTALL_=$INSTALL;;
818819
esac
820+
AC_SUBST(INSTALL_)
819821

820822
AC_PATH_PROG(TAR, tar)
821823
AC_PROG_LN_S

‎src/Makefile.global.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ BZIP2= bzip2
290290
# Installation.
291291

292292
install_sh =$(SHELL)$(top_srcdir)/config/install-sh -c
293-
INSTALL =$(if$(use_install_sh),$(install_sh),$(or @INSTALL@,$(install_sh)))
293+
INSTALL =$(if$(use_install_sh),$(install_sh),$(or @INSTALL_@,$(install_sh)))
294294

295295
INSTALL_SCRIPT_MODE= 755
296296
INSTALL_DATA_MODE= 644

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp