Skip to content

Commit 1d4be82

Browse files
committed
patch 8.0.0576: can't build when configure choses "install-sh"
Problem: Can't build when configure choses "install-sh". (Daniel Hahler) Solution: Always use install-sh. Fix remaining use of mkinstalldirs. (closes #1647)
1 parent a701b3b commit 1d4be82

File tree

7 files changed

+9
-83
lines changed

7 files changed

+9
-83
lines changed

src/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,11 @@ PROTO_FLAGS = -d -E"$(CPP)" $(NO_ATTR)
14081408

14091409
SHELL = /bin/sh
14101410

1411+
# We would normally use "mkdir -p" but it doesn't work properly everywhere.
1412+
# Using AC_PROG_MKDIR_P in configure.ac has a problem with the "auto"
1413+
# directory. Always use the install-sh script, it's slower but reliable.
1414+
MKDIR_P = $(SHELL) install-sh -c -d
1415+
14111416
.SUFFIXES:
14121417
.SUFFIXES: .c .o .pro
14131418

src/auto/configure

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,6 @@ XCODE_SELECT
725725
CPP_MM
726726
CROSS_COMPILING
727727
STRIP
728-
MKDIR_P
729728
AWK
730729
FGREP
731730
EGREP
@@ -3886,76 +3885,6 @@ fi
38863885

38873886
test -n "$AWK" && break
38883887
done
3889-
ac_aux_dir=
3890-
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3891-
if test -f "$ac_dir/install-sh"; then
3892-
ac_aux_dir=$ac_dir
3893-
ac_install_sh="$ac_aux_dir/install-sh -c"
3894-
break
3895-
elif test -f "$ac_dir/install.sh"; then
3896-
ac_aux_dir=$ac_dir
3897-
ac_install_sh="$ac_aux_dir/install.sh -c"
3898-
break
3899-
elif test -f "$ac_dir/shtool"; then
3900-
ac_aux_dir=$ac_dir
3901-
ac_install_sh="$ac_aux_dir/shtool install -c"
3902-
break
3903-
fi
3904-
done
3905-
if test -z "$ac_aux_dir"; then
3906-
as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
3907-
fi
3908-
3909-
# These three variables are undocumented and unsupported,
3910-
# and are intended to be withdrawn in a future Autoconf release.
3911-
# They can cause serious problems if a builder's source tree is in a directory
3912-
# whose full name contains unusual characters.
3913-
ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
3914-
ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
3915-
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
3916-
3917-
3918-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
3919-
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
3920-
if test -z "$MKDIR_P"; then
3921-
if ${ac_cv_path_mkdir+:} false; then :
3922-
$as_echo_n "(cached) " >&6
3923-
else
3924-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3925-
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
3926-
do
3927-
IFS=$as_save_IFS
3928-
test -z "$as_dir" && as_dir=.
3929-
for ac_prog in mkdir gmkdir; do
3930-
for ac_exec_ext in '' $ac_executable_extensions; do
3931-
as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3932-
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3933-
'mkdir (GNU coreutils) '* | \
3934-
'mkdir (coreutils) '* | \
3935-
'mkdir (fileutils) '4.1*)
3936-
ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
3937-
break 3;;
3938-
esac
3939-
done
3940-
done
3941-
done
3942-
IFS=$as_save_IFS
3943-
3944-
fi
3945-
3946-
test -d ./--version && rmdir ./--version
3947-
if test "${ac_cv_path_mkdir+set}" = set; then
3948-
MKDIR_P="$ac_cv_path_mkdir -p"
3949-
else
3950-
# As a last resort, use the slow shell script. Don't cache a
3951-
# value for MKDIR_P within a source directory, because that will
3952-
# break other packages using the cache if that directory is
3953-
# removed, or if the value is a relative name.
3954-
MKDIR_P="$ac_install_sh -d"
3955-
fi
3956-
fi
3957-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3958-
$as_echo "$MKDIR_P" >&6; }
39593888

39603889
# Extract the first word of "strip", so it can be a program name with args.
39613890
set dummy strip; ac_word=$2
@@ -14785,7 +14714,6 @@ gives unlimited permission to copy, distribute and modify it."
1478514714
1478614715
ac_pwd='$ac_pwd'
1478714716
srcdir='$srcdir'
14788-
MKDIR_P='$MKDIR_P'
1478914717
AWK='$AWK'
1479014718
test -n "\$AWK" || AWK=awk
1479114719
_ACEOF
@@ -15343,11 +15271,6 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
1534315271
# CONFIG_FILE
1534415272
#
1534515273
15346-
ac_MKDIR_P=$MKDIR_P
15347-
case $MKDIR_P in
15348-
[\\/$]* | ?:[\\/]* ) ;;
15349-
*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
15350-
esac
1535115274
_ACEOF
1535215275
1535315276
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15401,7 +15324,6 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
1540115324
s&@builddir@&$ac_builddir&;t t
1540215325
s&@abs_builddir@&$ac_abs_builddir&;t t
1540315326
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
15404-
s&@MKDIR_P@&$ac_MKDIR_P&;t t
1540515327
$ac_datarootdir_hack
1540615328
"
1540715329
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \

src/config.mk.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ AWK = @AWK@
103103

104104
STRIP = @STRIP@
105105

106-
MKDIR_P = @MKDIR_P@
107-
108106
EXEEXT = @EXEEXT@
109107
CROSS_COMPILING = @CROSS_COMPILING@
110108

src/configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ AC_PROGRAM_EGREP dnl required by AC_EGREP_CPP
1717
AC_PROG_FGREP dnl finds working grep -F
1818
AC_ISC_POSIX dnl required by AC_C_CROSS
1919
AC_PROG_AWK dnl required for "make html" in ../doc
20-
AC_PROG_MKDIR_P dnl portable "mkdir -p", also works in parallel
2120

2221
dnl Don't strip if we don't have it
2322
AC_CHECK_PROG(STRIP, strip, strip, :)

src/installman.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tutorsubloc=$scriptloc/tutor
3939
if test $what = "install" -o $what = "xxd"; then
4040
if test ! -d $destdir; then
4141
echo creating $destdir
42-
./mkinstalldirs $destdir
42+
/bin/sh install-sh -c -d $destdir
4343
fi
4444
fi
4545

src/installml.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ eviewname=$9
4949
if test $what = "install" -a \( -f $destdir/$vimname.1 -o -f $destdir/$vimdiffname.1 -o -f $destdir/$eviewname.1 \); then
5050
if test ! -d $destdir; then
5151
echo creating $destdir
52-
./mkinstalldirs $destdir
52+
/bin/sh install-sh -c -d $destdir
5353
fi
5454

5555
# ex

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
576,
767769
/**/
768770
575,
769771
/**/

0 commit comments

Comments
 (0)