mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Update of install-sh, mkinstalldirs, and associated configury
Update install-sh to that from Autoconf 2.63, plus our Darwin-specific changes (which I simplified a bit). install-sh is now able to install multiple files in one run, so we could simplify our makefiles sometime. install-sh also now has a -d option to create directories, so we don't need mkinstalldirs anymore. Use AC_PROG_MKDIR_P in configure.in, so we can use mkdir -p when available instead of install-sh -d. For consistency with the rest of the world, the corresponding make variable has been renamed from $(mkinstalldirs) to $(MKDIR_P).
This commit is contained in:
56
configure
vendored
56
configure
vendored
@ -687,6 +687,7 @@ FLEXFLAGS
|
||||
FLEX
|
||||
BISONFLAGS
|
||||
BISON
|
||||
MKDIR_P
|
||||
AWK
|
||||
LN_S
|
||||
TAR
|
||||
@ -6676,6 +6677,54 @@ fi
|
||||
test -n "$AWK" && break
|
||||
done
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
|
||||
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
||||
if test -z "$MKDIR_P"; then
|
||||
if test "${ac_cv_path_mkdir+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_prog in mkdir gmkdir; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
||||
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
||||
'mkdir (GNU coreutils) '* | \
|
||||
'mkdir (coreutils) '* | \
|
||||
'mkdir (fileutils) '4.1*)
|
||||
ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
|
||||
break 3;;
|
||||
esac
|
||||
done
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
|
||||
if test "${ac_cv_path_mkdir+set}" = set; then
|
||||
MKDIR_P="$ac_cv_path_mkdir -p"
|
||||
else
|
||||
# As a last resort, use the slow shell script. Don't cache a
|
||||
# value for MKDIR_P within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the value is a relative name.
|
||||
test -d ./--version && rmdir ./--version
|
||||
MKDIR_P="$ac_install_sh -d"
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
|
||||
$as_echo "$MKDIR_P" >&6; }
|
||||
|
||||
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
|
||||
# a relative path to it in each makefile where it subsitutes it. This clashes
|
||||
# with our Makefile.global concept. This workaround helps.
|
||||
case $MKDIR_P in
|
||||
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
|
||||
esac
|
||||
|
||||
# Let the user override the search
|
||||
if test -z "$BISON"; then
|
||||
@ -29011,6 +29060,7 @@ gives unlimited permission to copy, distribute and modify it."
|
||||
|
||||
ac_pwd='$ac_pwd'
|
||||
srcdir='$srcdir'
|
||||
MKDIR_P='$MKDIR_P'
|
||||
AWK='$AWK'
|
||||
test -n "\$AWK" || AWK=awk
|
||||
_ACEOF
|
||||
@ -29622,6 +29672,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
||||
#
|
||||
# CONFIG_FILE
|
||||
#
|
||||
|
||||
ac_MKDIR_P=$MKDIR_P
|
||||
case $MKDIR_P in
|
||||
[\\/$]* | ?:[\\/]* ) ;;
|
||||
*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
|
||||
esac
|
||||
_ACEOF
|
||||
|
||||
@ -29677,6 +29732,7 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
||||
s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
||||
s&@builddir@&$ac_builddir&;t t
|
||||
s&@abs_builddir@&$ac_abs_builddir&;t t
|
||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||
s&@MKDIR_P@&$ac_MKDIR_P&;t t
|
||||
$ac_datarootdir_hack
|
||||
"
|
||||
|
Reference in New Issue
Block a user