• R/O
  • HTTP
  • SSH
  • HTTPS

howm: Commit

Hitori Otegaru Wiki Modoki


Commit MetaInfo

Revision7c2b894772035abdbdfd8e45bedb7d52b25f68a5 (tree)
Time2021-12-28 20:45:35
AuthorHiraoka <khi@user...>
CommiterHiraoka

Log Message

update autotools

Change Summary

Incremental Difference

--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
@@ -157,6 +157,11 @@ am__uninstall_files_from_dir = { \
157157 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
158158 $(am__cd) "$$dir" && rm -f $$files; }; \
159159 }
160+am__emacs_byte_compile_setup = \
161+ (if (boundp (quote byte-compile-dest-file-function)) \
162+ (setq byte-compile-dest-file-function (lambda (_) "$@")) \
163+ (defun byte-compile-dest-file (_) "$@") \
164+ )
160165 am__installdirs = "$(DESTDIR)$(howmdir)"
161166 howmLISP_INSTALL = $(INSTALL_DATA)
162167 LISP = $(howm_LISP)
@@ -238,6 +243,8 @@ am__relativize = \
238243 DIST_ARCHIVES = $(distdir).tar.gz
239244 GZIP_ENV = --best
240245 DIST_TARGETS = dist-gzip
246+# Exists only to be overridden by the user if desired.
247+AM_DISTCHECK_DVI_TARGET = dvi
241248 distuninstallcheck_listfiles = find . -type f -print
242249 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
243250 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -414,7 +421,7 @@ howm.el: $(top_builddir)/config.status $(srcdir)/howm.el.in
414421 $(EMACS) --batch \
415422 $(AM_ELCFLAGS) $(ELCFLAGS) \
416423 $$am__subdir_includes -L $(builddir) -L $(srcdir) \
417- --eval '(setq byte-compile-dest-file-function (lambda (_) "$@"))' \
424+ --eval '$(am__emacs_byte_compile_setup)' \
418425 -f batch-byte-compile '$<'; \
419426 else :; fi
420427
@@ -638,6 +645,10 @@ dist-xz: distdir
638645 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
639646 $(am__post_remove_distdir)
640647
648+dist-zstd: distdir
649+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
650+ $(am__post_remove_distdir)
651+
641652 dist-tarZ: distdir
642653 @echo WARNING: "Support for distribution archives compressed with" \
643654 "legacy program 'compress' is deprecated." >&2
@@ -680,6 +691,8 @@ distcheck: dist
680691 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
681692 *.zip*) \
682693 unzip $(distdir).zip ;;\
694+ *.tar.zst*) \
695+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
683696 esac
684697 chmod -R a-w $(distdir)
685698 chmod u+w $(distdir)
@@ -695,7 +708,7 @@ distcheck: dist
695708 $(DISTCHECK_CONFIGURE_FLAGS) \
696709 --srcdir=../.. --prefix="$$dc_install_base" \
697710 && $(MAKE) $(AM_MAKEFLAGS) \
698- && $(MAKE) $(AM_MAKEFLAGS) dvi \
711+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
699712 && $(MAKE) $(AM_MAKEFLAGS) check \
700713 && $(MAKE) $(AM_MAKEFLAGS) install \
701714 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -757,7 +770,8 @@ installdirs-am:
757770 done
758771 install: $(BUILT_SOURCES)
759772 $(MAKE) $(AM_MAKEFLAGS) install-recursive
760-install-exec: install-exec-recursive
773+install-exec: $(BUILT_SOURCES)
774+ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
761775 install-data: install-data-recursive
762776 uninstall: uninstall-recursive
763777
@@ -857,23 +871,23 @@ ps-am:
857871 uninstall-am: uninstall-howmLISP
858872
859873 .MAKE: $(am__recursive_targets) all check install install-am \
860- install-strip
874+ install-exec install-strip
861875
862876 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
863877 am--refresh check check-am clean clean-cscope clean-generic \
864878 clean-lisp cscope cscopelist-am ctags ctags-am dist dist-all \
865879 dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
866- dist-zip distcheck distclean distclean-generic distclean-tags \
867- distcleancheck distdir distuninstallcheck dvi dvi-am html \
868- html-am info info-am install install-am install-data \
869- install-data-am install-dvi install-dvi-am install-exec \
870- install-exec-am install-howmLISP install-html install-html-am \
871- install-info install-info-am install-man install-pdf \
872- install-pdf-am install-ps install-ps-am install-strip \
873- installcheck installcheck-am installdirs installdirs-am \
874- maintainer-clean maintainer-clean-generic mostlyclean \
875- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
876- uninstall-am uninstall-howmLISP
880+ dist-zip dist-zstd distcheck distclean distclean-generic \
881+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
882+ dvi-am html html-am info info-am install install-am \
883+ install-data install-data-am install-dvi install-dvi-am \
884+ install-exec install-exec-am install-howmLISP install-html \
885+ install-html-am install-info install-info-am install-man \
886+ install-pdf install-pdf-am install-ps install-ps-am \
887+ install-strip installcheck installcheck-am installdirs \
888+ installdirs-am maintainer-clean maintainer-clean-generic \
889+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
890+ tags-am uninstall uninstall-am uninstall-howmLISP
877891
878892 .PRECIOUS: Makefile
879893
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
1-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
1+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
22
3-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
3+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
44
55 # This file is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
2020 If you have problems, you may need to regenerate the build system entirely.
2121 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222
23-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
23+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
2424 #
2525 # This file is free software; the Free Software Foundation
2626 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3535 [am__api_version='1.16'
3636 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3737 dnl require some minimum version. Point them to the right macro.
38-m4_if([$1], [1.16.1], [],
38+m4_if([$1], [1.16.3], [],
3939 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4040 ])
4141
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5151 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5252 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5353 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54-[AM_AUTOMAKE_VERSION([1.16.1])dnl
54+[AM_AUTOMAKE_VERSION([1.16.3])dnl
5555 m4_ifndef([AC_AUTOCONF_VERSION],
5656 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5757 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5858
5959 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
6060
61-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
61+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
6262 #
6363 # This file is free software; the Free Software Foundation
6464 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
110110
111111 # AM_CONDITIONAL -*- Autoconf -*-
112112
113-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
113+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
114114 #
115115 # This file is free software; the Free Software Foundation
116116 # gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@ fi])])
143143
144144 # Do all the work for Automake. -*- Autoconf -*-
145145
146-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
146+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
147147 #
148148 # This file is free software; the Free Software Foundation
149149 # gives unlimited permission to copy and/or distribute it,
@@ -340,7 +340,7 @@ for _am_header in $config_headers :; do
340340 done
341341 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
342342
343-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
343+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
344344 #
345345 # This file is free software; the Free Software Foundation
346346 # gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@ if test x"${install_sh+set}" != xset; then
361361 fi
362362 AC_SUBST([install_sh])])
363363
364-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
364+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
365365 #
366366 # This file is free software; the Free Software Foundation
367367 # gives unlimited permission to copy and/or distribute it,
@@ -383,7 +383,7 @@ AC_SUBST([am__leading_dot])])
383383 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
384384 # From Jim Meyering
385385
386-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
386+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
387387 #
388388 # This file is free software; the Free Software Foundation
389389 # gives unlimited permission to copy and/or distribute it,
@@ -418,7 +418,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
418418
419419 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
420420
421-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
421+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
422422 #
423423 # This file is free software; the Free Software Foundation
424424 # gives unlimited permission to copy and/or distribute it,
@@ -439,12 +439,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
439439 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
440440 AC_REQUIRE_AUX_FILE([missing])dnl
441441 if test x"${MISSING+set}" != xset; then
442- case $am_aux_dir in
443- *\ * | *\ *)
444- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
445- *)
446- MISSING="\${SHELL} $am_aux_dir/missing" ;;
447- esac
442+ MISSING="\${SHELL} '$am_aux_dir/missing'"
448443 fi
449444 # Use eval to expand $SHELL
450445 if eval "$MISSING --is-lightweight"; then
@@ -457,7 +452,7 @@ fi
457452
458453 # Helper functions for option handling. -*- Autoconf -*-
459454
460-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
455+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
461456 #
462457 # This file is free software; the Free Software Foundation
463458 # gives unlimited permission to copy and/or distribute it,
@@ -488,7 +483,7 @@ AC_DEFUN([_AM_IF_OPTION],
488483
489484 # Check to make sure that the build environment is sane. -*- Autoconf -*-
490485
491-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
486+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
492487 #
493488 # This file is free software; the Free Software Foundation
494489 # gives unlimited permission to copy and/or distribute it,
@@ -569,7 +564,7 @@ AC_CONFIG_COMMANDS_PRE(
569564 rm -f conftest.file
570565 ])
571566
572-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
567+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
573568 #
574569 # This file is free software; the Free Software Foundation
575570 # gives unlimited permission to copy and/or distribute it,
@@ -629,7 +624,7 @@ AC_SUBST([AM_BACKSLASH])dnl
629624 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
630625 ])
631626
632-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
627+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
633628 #
634629 # This file is free software; the Free Software Foundation
635630 # gives unlimited permission to copy and/or distribute it,
@@ -657,7 +652,7 @@ fi
657652 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
658653 AC_SUBST([INSTALL_STRIP_PROGRAM])])
659654
660-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
655+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
661656 #
662657 # This file is free software; the Free Software Foundation
663658 # gives unlimited permission to copy and/or distribute it,
@@ -676,7 +671,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
676671
677672 # Check how to create a tarball. -*- Autoconf -*-
678673
679-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
674+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
680675 #
681676 # This file is free software; the Free Software Foundation
682677 # gives unlimited permission to copy and/or distribute it,
--- a/configure
+++ b/configure
@@ -1970,12 +1970,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
19701970 am_aux_dir=`cd "$ac_aux_dir" && pwd`
19711971
19721972 if test x"${MISSING+set}" != xset; then
1973- case $am_aux_dir in
1974- *\ * | *\ *)
1975- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1976- *)
1977- MISSING="\${SHELL} $am_aux_dir/missing" ;;
1978- esac
1973+ MISSING="\${SHELL} '$am_aux_dir/missing'"
19791974 fi
19801975 # Use eval to expand $SHELL
19811976 if eval "$MISSING --is-lightweight"; then
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
--- a/en/Makefile.in
+++ b/en/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
--- a/fr/Makefile.in
+++ b/fr/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
11 #!/bin/sh
22 # install - install a program, script, or datafile
33
4-scriptversion=2018-03-11.20; # UTC
4+scriptversion=2020-11-14.01; # UTC
55
66 # This originates from X11R5 (mit/util/scripts/install.sh), which was
77 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
6969 # Desired mode of installed file.
7070 mode=0755
7171
72+# Create dirs (including intermediate dirs) using mode 755.
73+# This is like GNU 'install' as of coreutils 8.32 (2020).
74+mkdir_umask=22
75+
76+backupsuffix=
7277 chgrpcmd=
7378 chmodcmd=$chmodprog
7479 chowncmd=
@@ -99,18 +104,28 @@ Options:
99104 --version display version info and exit.
100105
101106 -c (ignored)
102- -C install only if different (preserve the last data modification time)
107+ -C install only if different (preserve data modification time)
103108 -d create directories instead of installing files.
104109 -g GROUP $chgrpprog installed files to GROUP.
105110 -m MODE $chmodprog installed files to MODE.
106111 -o USER $chownprog installed files to USER.
112+ -p pass -p to $cpprog.
107113 -s $stripprog installed files.
114+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
108115 -t DIRECTORY install into DIRECTORY.
109116 -T report an error if DSTFILE is a directory.
110117
111118 Environment variables override the default commands:
112119 CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
113120 RMPROG STRIPPROG
121+
122+By default, rm is invoked with -f; when overridden with RMPROG,
123+it's up to you to specify -f if you want it.
124+
125+If -S is not specified, no backups are attempted.
126+
127+Email bug reports to bug-automake@gnu.org.
128+Automake home page: https://www.gnu.org/software/automake/
114129 "
115130
116131 while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
137152 -o) chowncmd="$chownprog $2"
138153 shift;;
139154
155+ -p) cpprog="$cpprog -p";;
156+
140157 -s) stripcmd=$stripprog;;
141158
159+ -S) backupsuffix="$2"
160+ shift;;
161+
142162 -t)
143163 is_target_a_directory=always
144164 dst_arg=$2
@@ -255,6 +275,10 @@ do
255275 dstdir=$dst
256276 test -d "$dstdir"
257277 dstdir_status=$?
278+ # Don't chown directories that already exist.
279+ if test $dstdir_status = 0; then
280+ chowncmd=""
281+ fi
258282 else
259283
260284 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -301,22 +325,6 @@ do
301325 if test $dstdir_status != 0; then
302326 case $posix_mkdir in
303327 '')
304- # Create intermediate dirs using mode 755 as modified by the umask.
305- # This is like FreeBSD 'install' as of 1997-10-28.
306- umask=`umask`
307- case $stripcmd.$umask in
308- # Optimize common cases.
309- *[2367][2367]) mkdir_umask=$umask;;
310- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
311-
312- *[0-7])
313- mkdir_umask=`expr $umask + 22 \
314- - $umask % 100 % 40 + $umask % 20 \
315- - $umask % 10 % 4 + $umask % 2
316- `;;
317- *) mkdir_umask=$umask,go-w;;
318- esac
319-
320328 # With -d, create the new directory with the user-specified mode.
321329 # Otherwise, rely on $mkdir_umask.
322330 if test -n "$dir_arg"; then
@@ -326,52 +334,49 @@ do
326334 fi
327335
328336 posix_mkdir=false
329- case $umask in
330- *[123567][0-7][0-7])
331- # POSIX mkdir -p sets u+wx bits regardless of umask, which
332- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
333- ;;
334- *)
335- # Note that $RANDOM variable is not portable (e.g. dash); Use it
336- # here however when possible just to lower collision chance.
337- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
338-
339- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
340-
341- # Because "mkdir -p" follows existing symlinks and we likely work
342- # directly in world-writeable /tmp, make sure that the '$tmpdir'
343- # directory is successfully created first before we actually test
344- # 'mkdir -p' feature.
345- if (umask $mkdir_umask &&
346- $mkdirprog $mkdir_mode "$tmpdir" &&
347- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
348- then
349- if test -z "$dir_arg" || {
350- # Check for POSIX incompatibilities with -m.
351- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
352- # other-writable bit of parent directory when it shouldn't.
353- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
354- test_tmpdir="$tmpdir/a"
355- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
356- case $ls_ld_tmpdir in
357- d????-?r-*) different_mode=700;;
358- d????-?--*) different_mode=755;;
359- *) false;;
360- esac &&
361- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
362- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
363- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
364- }
365- }
366- then posix_mkdir=:
367- fi
368- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
369- else
370- # Remove any dirs left behind by ancient mkdir implementations.
371- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
372- fi
373- trap '' 0;;
374- esac;;
337+ # The $RANDOM variable is not portable (e.g., dash). Use it
338+ # here however when possible just to lower collision chance.
339+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
340+
341+ trap '
342+ ret=$?
343+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
344+ exit $ret
345+ ' 0
346+
347+ # Because "mkdir -p" follows existing symlinks and we likely work
348+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
349+ # directory is successfully created first before we actually test
350+ # 'mkdir -p'.
351+ if (umask $mkdir_umask &&
352+ $mkdirprog $mkdir_mode "$tmpdir" &&
353+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
354+ then
355+ if test -z "$dir_arg" || {
356+ # Check for POSIX incompatibilities with -m.
357+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
358+ # other-writable bit of parent directory when it shouldn't.
359+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
360+ test_tmpdir="$tmpdir/a"
361+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
362+ case $ls_ld_tmpdir in
363+ d????-?r-*) different_mode=700;;
364+ d????-?--*) different_mode=755;;
365+ *) false;;
366+ esac &&
367+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
368+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
369+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
370+ }
371+ }
372+ then posix_mkdir=:
373+ fi
374+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
375+ else
376+ # Remove any dirs left behind by ancient mkdir implementations.
377+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
378+ fi
379+ trap '' 0;;
375380 esac
376381
377382 if
@@ -382,7 +387,7 @@ do
382387 then :
383388 else
384389
385- # The umask is ridiculous, or mkdir does not conform to POSIX,
390+ # mkdir does not conform to POSIX,
386391 # or it failed possibly due to a race condition. Create the
387392 # directory the slow way, step by step, checking for races as we go.
388393
@@ -411,7 +416,7 @@ do
411416 prefixes=
412417 else
413418 if $posix_mkdir; then
414- (umask=$mkdir_umask &&
419+ (umask $mkdir_umask &&
415420 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
416421 # Don't fail if two instances are running concurrently.
417422 test -d "$prefix" || exit 1
@@ -451,7 +456,18 @@ do
451456 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
452457
453458 # Copy the file name to the temp name.
454- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
459+ (umask $cp_umask &&
460+ { test -z "$stripcmd" || {
461+ # Create $dsttmp read-write so that cp doesn't create it read-only,
462+ # which would cause strip to fail.
463+ if test -z "$doit"; then
464+ : >"$dsttmp" # No need to fork-exec 'touch'.
465+ else
466+ $doit touch "$dsttmp"
467+ fi
468+ }
469+ } &&
470+ $doit_exec $cpprog "$src" "$dsttmp") &&
455471
456472 # and set any options; do chmod last to preserve setuid bits.
457473 #
@@ -477,6 +493,13 @@ do
477493 then
478494 rm -f "$dsttmp"
479495 else
496+ # If $backupsuffix is set, and the file being installed
497+ # already exists, attempt a backup. Don't worry if it fails,
498+ # e.g., if mv doesn't support -f.
499+ if test -n "$backupsuffix" && test -f "$dst"; then
500+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
501+ fi
502+
480503 # Rename the file to the real destination.
481504 $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
482505
@@ -491,9 +514,9 @@ do
491514 # file should still install successfully.
492515 {
493516 test ! -f "$dst" ||
494- $doit $rmcmd -f "$dst" 2>/dev/null ||
517+ $doit $rmcmd "$dst" 2>/dev/null ||
495518 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
496- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
519+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
497520 } ||
498521 { echo "$0: cannot unlink or rename $dst" >&2
499522 (exit 1); exit 1
--- a/ja/Makefile.in
+++ b/ja/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
--- a/missing
+++ b/missing
@@ -3,7 +3,7 @@
33
44 scriptversion=2018-03-07.03; # UTC
55
6-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
6+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
77 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
88
99 # This program is free software; you can redistribute it and/or modify
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
11 #! /bin/sh
22 # mkinstalldirs --- make directory hierarchy
33
4-scriptversion=2018-03-07.03; # UTC
4+scriptversion=2020-07-26.22; # UTC
55
66 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
77 # Created: 1993-05-16
@@ -92,6 +92,8 @@ case $dirmode in
9292 *)
9393 if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
9494 test ! -d ./--version; then
95+ echo "umask 22"
96+ umask 22
9597 echo "mkdir -m $dirmode -p -- $*"
9698 exec mkdir -m "$dirmode" -p -- "$@"
9799 else
@@ -104,6 +106,9 @@ case $dirmode in
104106 ;;
105107 esac
106108
109+echo "umask 22"
110+umask 22
111+
107112 for file
108113 do
109114 case $file in
@@ -132,21 +137,16 @@ do
132137
133138 if test ! -d "$pathcomp"; then
134139 errstatus=$lasterr
135- else
136- if test ! -z "$dirmode"; then
137- echo "chmod $dirmode $pathcomp"
138- lasterr=
139- chmod "$dirmode" "$pathcomp" || lasterr=$?
140-
141- if test ! -z "$lasterr"; then
142- errstatus=$lasterr
143- fi
144- fi
145140 fi
146141 fi
147142
148143 pathcomp=$pathcomp/
149144 done
145+
146+ if test ! -z "$dirmode"; then
147+ echo "chmod $dirmode $file"
148+ chmod "$dirmode" "$file" || errstatus=$?
149+ fi
150150 done
151151
152152 exit $errstatus
--- a/sample/Makefile.in
+++ b/sample/Makefile.in
@@ -1,7 +1,7 @@
1-# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+# Makefile.in generated by automake 1.16.3 from Makefile.am.
22 # @configure_input@
33
4-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
Show on old repository browser