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

Commitdcd5af6

Browse files
committed
Further fix install program detection
The $(or) make function was introduced in GNU make 3.81, so theprevious coding didn't work in 3.80. Write it differently, andimprove the variable naming to make more sense in the new coding.
1 parent39715af commitdcd5af6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

‎configure‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ MKDIR_P
693693
AWK
694694
LN_S
695695
TAR
696-
INSTALL_
696+
install_bin
697697
INSTALL_DATA
698698
INSTALL_SCRIPT
699699
INSTALL_PROGRAM
@@ -6956,8 +6956,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
69566956
# a relative path to it in each makefile where it subsitutes it. This clashes
69576957
# with our Makefile.global concept. This workaround helps.
69586958
case $INSTALL in
6959-
*install-sh*)INSTALL_='';;
6960-
*)INSTALL_=$INSTALL;;
6959+
*install-sh*)install_bin='';;
6960+
*)install_bin=$INSTALL;;
69616961
esac
69626962

69636963

‎configure.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,10 +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_='';;
818-
*)INSTALL_=$INSTALL;;
817+
*install-sh*)install_bin='';;
818+
*)install_bin=$INSTALL;;
819819
esac
820-
AC_SUBST(INSTALL_)
820+
AC_SUBST(install_bin)
821821

822822
AC_PATH_PROG(TAR, tar)
823823
AC_PROG_LN_S

‎src/Makefile.global.in‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,9 @@ BZIP2= bzip2
289289

290290
# Installation.
291291

292+
install_bin = @install_bin@
292293
install_sh =$(SHELL)$(top_srcdir)/config/install-sh -c
293-
INSTALL =$(if$(use_install_sh),$(install_sh),$(or @INSTALL_@,$(install_sh)))
294+
INSTALL =$(if$(use_install_sh),$(install_sh),$(if$(install_bin),$(install_bin),$(install_sh)))
294295

295296
INSTALL_SCRIPT_MODE= 755
296297
INSTALL_DATA_MODE= 644

0 commit comments

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