diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-02 12:37:52 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-02 12:38:49 -0700 |
commit | fda015e7b82a1ec3d1cb075799a67772744ce6c1 (patch) | |
tree | fd24150923a0afb809cfcf063c454b3e1aacdf7a /build-aux | |
parent | 7c37b17b3d6a9be06fa25b19f5eccbc72c52f71c (diff) | |
download | emacs-fda015e7b82a1ec3d1cb075799a67772744ce6c1.tar.gz |
Update from Gnulib
This incorporates:
2019-08-25 intprops.h, verify.h: port better to clang
2019-08-21 New strip-trailing-space option for srclist-update
* .gitattributes: Remove doc/misc/texinfo.tex special case,
which is no longer needed now that Gnulib trims blank-at-eol.
* build-aux/install-sh, doc/misc/texinfo.tex, lib/intprops.h:
* lib/regex_internal.c, lib/verify.h: Copy from Gnulib.
Diffstat (limited to 'build-aux')
-rwxr-xr-x | build-aux/install-sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/build-aux/install-sh b/build-aux/install-sh index 8175c640fe6..20d8b2eaea9 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -451,7 +451,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # |