mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
Autoupdate from Gnulib
This commit is contained in:
parent
a5f190dd65
commit
7ce25de888
3 changed files with 22 additions and 13 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
|
|
||||||
scriptversion=2018-03-07.03; # UTC
|
scriptversion=2018-03-11.20; # UTC
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
|
|
@ -332,34 +332,43 @@ do
|
||||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
# Note that $RANDOM variable is not portable (e.g. dash); Use it
|
||||||
|
# here however when possible just to lower collision chance.
|
||||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
|
||||||
|
|
||||||
|
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
|
||||||
|
|
||||||
|
# Because "mkdir -p" follows existing symlinks and we likely work
|
||||||
|
# directly in world-writeable /tmp, make sure that the '$tmpdir'
|
||||||
|
# directory is successfully created first before we actually test
|
||||||
|
# 'mkdir -p' feature.
|
||||||
if (umask $mkdir_umask &&
|
if (umask $mkdir_umask &&
|
||||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
$mkdirprog $mkdir_mode "$tmpdir" &&
|
||||||
|
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
if test -z "$dir_arg" || {
|
if test -z "$dir_arg" || {
|
||||||
# Check for POSIX incompatibilities with -m.
|
# Check for POSIX incompatibilities with -m.
|
||||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||||
# other-writable bit of parent directory when it shouldn't.
|
# other-writable bit of parent directory when it shouldn't.
|
||||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
test_tmpdir="$tmpdir/a"
|
||||||
|
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
|
||||||
case $ls_ld_tmpdir in
|
case $ls_ld_tmpdir in
|
||||||
d????-?r-*) different_mode=700;;
|
d????-?r-*) different_mode=700;;
|
||||||
d????-?--*) different_mode=755;;
|
d????-?--*) different_mode=755;;
|
||||||
*) false;;
|
*) false;;
|
||||||
esac &&
|
esac &&
|
||||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
|
||||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
|
||||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
then posix_mkdir=:
|
then posix_mkdir=:
|
||||||
fi
|
fi
|
||||||
rmdir "$tmpdir/d" "$tmpdir"
|
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
|
||||||
else
|
else
|
||||||
# Remove any dirs left behind by ancient mkdir implementations.
|
# Remove any dirs left behind by ancient mkdir implementations.
|
||||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
|
||||||
fi
|
fi
|
||||||
trap '' 0;;
|
trap '' 0;;
|
||||||
esac;;
|
esac;;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
% Load plain if necessary, i.e., if running under initex.
|
% Load plain if necessary, i.e., if running under initex.
|
||||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||||
%
|
%
|
||||||
\def\texinfoversion{2018-02-12.17}
|
\def\texinfoversion{2018-03-10.14}
|
||||||
%
|
%
|
||||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||||
|
|
@ -182,7 +182,7 @@
|
||||||
% Hyphenation fixes.
|
% Hyphenation fixes.
|
||||||
\hyphenation{
|
\hyphenation{
|
||||||
Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
|
Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
|
||||||
auto-ma-ti-cal-ly ap-pen-dix bit-map bit-maps
|
ap-pen-dix bit-map bit-maps
|
||||||
data-base data-bases eshell fall-ing half-way long-est man-u-script
|
data-base data-bases eshell fall-ing half-way long-est man-u-script
|
||||||
man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
|
man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
|
||||||
par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
|
par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
|
||||||
|
|
@ -11715,7 +11715,7 @@ directory should work if nowhere else does.}
|
||||||
@markupsetuprqdefault
|
@markupsetuprqdefault
|
||||||
|
|
||||||
@c Local variables:
|
@c Local variables:
|
||||||
@c eval: (add-hook 'write-file-hooks 'time-stamp)
|
@c eval: (add-hook 'before-save-hook 'time-stamp)
|
||||||
@c page-delimiter: "^\\\\message\\|emacs-page"
|
@c page-delimiter: "^\\\\message\\|emacs-page"
|
||||||
@c time-stamp-start: "def\\\\texinfoversion{"
|
@c time-stamp-start: "def\\\\texinfoversion{"
|
||||||
@c time-stamp-format: "%:y-%02m-%02d.%02H"
|
@c time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
# with or without modifications, as long as this notice is preserved.
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
#serial 7
|
#serial 8
|
||||||
|
|
||||||
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
|
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
|
||||||
# New applications should use gl_GETLOADAVG instead.
|
# New applications should use gl_GETLOADAVG instead.
|
||||||
|
|
@ -22,7 +22,7 @@ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
|
||||||
|
|
||||||
gl_save_LIBS=$LIBS
|
gl_save_LIBS=$LIBS
|
||||||
|
|
||||||
# getloadvg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0,
|
# getloadavg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0,
|
||||||
# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
|
# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
|
||||||
HAVE_GETLOADAVG=1
|
HAVE_GETLOADAVG=1
|
||||||
AC_CHECK_FUNC([getloadavg], [],
|
AC_CHECK_FUNC([getloadavg], [],
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue