omit $Id$ in generated output; it is useful, but too painful to commit autosources and generated files separately

git-svn-id: svn://tug.org/texlive/trunk@55466 c570f23f-e606-0410-a88d-b1316a301751

35 files changed, 227 insertions, 119 deletions

diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index bb4be69d7f6..21c3711bf20 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -491,7 +491,11 @@ DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk
 recurse_this = 
 recurse_top = 
 
-# $Id$
+# am/recurse.am: Makefile fragment to configure and build subdirs.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2013      Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
diff --git a/Build/source/am/ChangeLog b/Build/source/am/ChangeLog
index 6b72cb9fc35..cf4170e688d 100644
--- a/Build/source/am/ChangeLog
+++ b/Build/source/am/ChangeLog
@@ -1,6 +1,8 @@
 2017-02-17  Karl Berry  <karl@freefriends.org>
 
-	* recurse.am: doc fixes.
+	* bin_links.am,
+	* recurse.am: consistently omit $Id$ from generated Makefile.in,
+	but do include comments.
 
 2017-02-16  Karl Berry  <karl@tug.org>
 
diff --git a/Build/source/am/bin_links.am b/Build/source/am/bin_links.am
index 19837fa4b30..2ff85d0cbe1 100644
--- a/Build/source/am/bin_links.am
+++ b/Build/source/am/bin_links.am
@@ -1,18 +1,19 @@
-# $Id$
+## $Id$
 # am/bin_links.am: Makefile fragment for bindir links.
-##
-## Copyright 2017      Karl Berry <tex-live@tug.org>
-## Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
-## You may freely use, modify and/or distribute this file.
-##
-## requires conditional WIN32
-## requires $(bin_links)
-## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-##  for binaries and scripts use, e.g.,
-##    binprog$(EXEEXT):foo
-##    script:bar
-##  respectively, such that the links created on cygwin are
-##    'foo->binprog.exe' and 'bar->script'.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/am/recurse.am b/Build/source/am/recurse.am
index 3c6221a93db..7bfe320c99d 100644
--- a/Build/source/am/recurse.am
+++ b/Build/source/am/recurse.am
@@ -1,9 +1,9 @@
-# $Id$
-## am/recurse.am: Makefile fragment to configure and build subdirs.
-##
-## Copyright 2017      Karl Berry <tex-live@tug.org>
-## Copyright 2013 Peter Breitenlohner <tex-live@tug.org>
-## You may freely use, modify and/or distribute this file.
+## $Id$
+# am/recurse.am: Makefile fragment to configure and build subdirs.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2013      Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
diff --git a/Build/source/configure b/Build/source/configure
index d862d04524d..b1786e5287c 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -4199,8 +4199,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
 ## configure options and TL libraries required for autosp.
 # Check whether --enable-autosp was given.
 if test "${enable_autosp+set}" = set; then :
@@ -4218,8 +4217,7 @@ $as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
     ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
 ## configure options and TL libraries for axodraw2.
 # Check whether --enable-axodraw2 was given.
 if test "${enable_axodraw2+set}" = set; then :
@@ -4399,9 +4397,8 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
     ;;
 esac
 
-# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $
-# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
-## configure options and TL libraries required for xindy
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
   enableval=$enable_xindy;
@@ -4513,9 +4510,8 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
-## configure options for TeX and MF
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
+# configure options for TeX and MF
 
 # Check whether --with-banner-add was given.
 if test "${with_banner_add+set}" = set; then :
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 56a46508b64..25a27e025b6 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -417,7 +417,11 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = libs/
 recurse_top = ../
 
-# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+# am/recurse.am: Makefile fragment to configure and build subdirs.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2013      Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index c80f0095551..4d763aee838 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3379,8 +3379,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
 ## configure options and TL libraries required for autosp.
 # Check whether --enable-autosp was given.
 if test "${enable_autosp+set}" = set; then :
@@ -3398,8 +3397,7 @@ $as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
     ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
 ## configure options and TL libraries for axodraw2.
 # Check whether --enable-axodraw2 was given.
 if test "${enable_axodraw2+set}" = set; then :
@@ -3579,9 +3577,8 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
     ;;
 esac
 
-# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $
-# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
-## configure options and TL libraries required for xindy
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
   enableval=$enable_xindy;
@@ -3693,9 +3690,8 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
-## configure options for TeX and MF
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
+# configure options for TeX and MF
 
 # Check whether --with-banner-add was given.
 if test "${with_banner_add+set}" = set; then :
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index c1a388747d5..9e42bd3bd78 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac: omit $Id$ from generated output.
+
 2017-02-16  Karl Berry  <karl@freefriends.org>
 
 	* configure.ac (AC_INIT): tex-live@tug.org instead of peb.
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index f871e1e1305..771f3897425 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -417,7 +417,11 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = texk/
 recurse_top = ../
 
-# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+# am/recurse.am: Makefile fragment to configure and build subdirs.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2013      Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index fb8d6cbcda7..6b243ac136b 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 
 
 VPATH = @srcdir@
@@ -1608,8 +1623,6 @@ config.force: $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 0b44de9dcd7..b356b7cdd43 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3379,8 +3379,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
 ## configure options and TL libraries required for autosp.
 # Check whether --enable-autosp was given.
 if test "${enable_autosp+set}" = set; then :
@@ -3398,8 +3397,7 @@ $as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
     ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
 ## configure options and TL libraries for axodraw2.
 # Check whether --enable-axodraw2 was given.
 if test "${enable_axodraw2+set}" = set; then :
@@ -3579,9 +3577,8 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
     ;;
 esac
 
-# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $
-# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
-## configure options and TL libraries required for xindy
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
   enableval=$enable_xindy;
@@ -3693,9 +3690,8 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
-## configure options for TeX and MF
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
+# configure options for TeX and MF
 
 # Check whether --with-banner-add was given.
 if test "${with_banner_add+set}" = set; then :
diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac
index f996e092b1b..518993847f6 100644
--- a/Build/source/texk/configure.ac
+++ b/Build/source/texk/configure.ac
@@ -1,7 +1,7 @@
-# $Id$
+dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright 2017      Karl Berry <tex-live@tug.org>
+dnl   Copyright 2017-2020 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 93d10a2c756..a39bd5e559e 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 
 
 VPATH = @srcdir@
@@ -1291,8 +1306,6 @@ $(dvilj4l_OBJECTS): libdvilj.a
 
 @KPATHSEA_RULE@
 
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 3a1d69ec6e3..c86fc81ea0d 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 
 
 VPATH = @srcdir@
@@ -1948,8 +1963,6 @@ uninstall-man: uninstall-man1
 
 $(xdvipdfmx_OBJECTS): config.force
 
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 070607fd6e0..01c8c9e5dff 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -1574,8 +1589,6 @@ config.force: $(dvipng_dependencies)
 @FREETYPE2_RULE@
 @LIBPNG_RULE@
 
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index fcef5c522a2..5af72b2d14c 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac,
+	* Makefile.am: omit $Id$ from generated Makefile.in.
+
 2019-11-19  Martin Gieseking  <martin.gieseking@uos.de>
 
 	* version.ac: 2.8.1; update sources and patches.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 71816233f41..12343286895 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -1,7 +1,7 @@
-# $Id$
+## $Id$
 # Makefile.am for the TeX Live subdirectory texk/dvisvgm/
 #
-# Copyright 2015-2017 Karl Berry <tex-live@tug.org>
+# Copyright 2015-2020 Karl Berry <tex-live@tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 #
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 9b8f200d32f..8629806700c 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -14,10 +14,9 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 49882 2019-01-31 18:21:25Z karl $
 # Makefile.am for the TeX Live subdirectory texk/dvisvgm/
 #
-# Copyright 2015-2017 Karl Berry <tex-live@tug.org>
+# Copyright 2015-2020 Karl Berry <tex-live@tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 #
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index d53264f534d..c6cdc12aeb8 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -1,4 +1,4 @@
-# $Id$
+dnl $Id$
 dnl Process this file with autoconf to produce a configure script
 dnl for dvisvgm in TeX Live.
 dnl
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ccc00952dbc..f0cafa04401 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* ac/web2c.ac: omit $Id$ from output.
+
 2020-06-07  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctangleboot.cin,
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a6f8f30118d..058cc729997 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 
 
 
@@ -18864,8 +18879,6 @@ $(libsynctex_a_OBJECTS): $(ZLIB_DEPEND)
 synctexdir/synctex.log: synctex$(EXEEXT)
 libmd5/md5.log: md5main$(EXEEXT)
 
-# $Id$
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index c9bbe115f7d..40afc44f3d6 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,11 +1,11 @@
-# $Id$
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+dnl $Id$
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
 dnl
-dnl Copyright 2015-2019 Karl Berry <tex-live@tug.org>
+dnl Copyright 2015-2020 Karl Berry <tex-live@tug.org>
 dnl Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
-## configure options for TeX and MF
+# configure options for TeX and MF
 m4_define_default([kpse_indent_26], [26])[]dnl
 AC_ARG_WITH([banner-add],
             AS_HELP_STRING([--with-banner-add=STR],
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 11a665ff9ea..080b73bc37f 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18594,9 +18594,8 @@ fi
 
 # Include additional code for web2c.
 
-# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
-## configure options for TeX and MF
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
+# configure options for TeX and MF
 
 # Check whether --with-banner-add was given.
 if test "${with_banner_add+set}" = set; then :
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index f5e207b5cf1..8b929b32d1a 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -14,6 +14,21 @@
 
 @SET_MAKE@
 
+# am/bin_links.am: Makefile fragment for bindir links.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+#
+# requires conditional WIN32
+# requires $(bin_links)
+# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+#  for binaries and scripts use, e.g.,
+#    binprog$(EXEEXT):foo
+#    script:bar
+#  respectively, such that the links created on cygwin are
+#    'foo->binprog.exe' and 'bar->script'.
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -1388,8 +1403,6 @@ $(proglib): ${top_srcdir}/lib/*.c
 
 @KPATHSEA_RULE@
 
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 4fc12e1e2a7..186d07444c9 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -417,7 +417,11 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = utils/
 recurse_top = ../
 
-# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+# am/recurse.am: Makefile fragment to configure and build subdirs.
+#
+# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2013      Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog
index cea86cadd8e..b260eef51a8 100644
--- a/Build/source/utils/autosp/ChangeLog
+++ b/Build/source/utils/autosp/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* ac/withenable.ac: omit $Id$ from generated output.
+
 2020-02-07  Akira Kakuto  <kakuto@w32tex.org>
 
 	* Import autosp-2020-02-06.
diff --git a/Build/source/utils/autosp/Makefile.am b/Build/source/utils/autosp/Makefile.am
index 94d4c76fec9..169f6506dd6 100644
--- a/Build/source/utils/autosp/Makefile.am
+++ b/Build/source/utils/autosp/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 ## Makefile.am for the TeX Live subdirectory utils/autosp/
 ##
-## Copyright 2016-2018 Karl Berry <tex-live@tug.org>
+## Copyright 2016-2020 Karl Berry <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## We want to re-distribute the whole original ps2eps source tree.
@@ -13,8 +13,8 @@ NEVER_NAMES += $(NEVER_NAMES_SUB)
 
 AM_CFLAGS = $(WARNING_CFLAGS)
 
-# We intentionally omit the rebar program, since the name just seems to
-# be generic to end up in system bindirs, and it's said to just be a
+# We intentionally omit the rebar program, since the name seems too
+# generic to end up in system bindirs, and it's said to only be a
 # convenience.  People can get it from the Werner Icking Music Archive.
 bin_PROGRAMS = autosp tex2aspc
 
diff --git a/Build/source/utils/autosp/ac/withenable.ac b/Build/source/utils/autosp/ac/withenable.ac
index bab1844784e..93dce0db75e 100644
--- a/Build/source/utils/autosp/ac/withenable.ac
+++ b/Build/source/utils/autosp/ac/withenable.ac
@@ -1,7 +1,7 @@
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id$
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
+dnl $Id$
 dnl
-dnl Copyright 2016--2018 Karl Berry <tex-live@tug.org>
+dnl Copyright 2016-2020 Karl Berry <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries required for autosp.
diff --git a/Build/source/utils/axodraw2/ChangeLog b/Build/source/utils/axodraw2/ChangeLog
index 7a3000318c1..92371f1d65c 100644
--- a/Build/source/utils/axodraw2/ChangeLog
+++ b/Build/source/utils/axodraw2/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac,
+	* ac/withenable.ac: omit $Id$ from generated output.
+	
+	* configure.ac (AC_CHECK_LIB([m]): check for erf, not sqrt.
+	(Missed this in earlier changes in other dirs.)
+
 2019-09-07  Akira Kakuto  <kakuto@w32tex.org>
 
 	Import v1.3 from ctan.org/pkg/axodraw2.
diff --git a/Build/source/utils/axodraw2/ac/withenable.ac b/Build/source/utils/axodraw2/ac/withenable.ac
index 8208d94b072..8bfeb759b5f 100644
--- a/Build/source/utils/axodraw2/ac/withenable.ac
+++ b/Build/source/utils/axodraw2/ac/withenable.ac
@@ -1,7 +1,7 @@
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id$
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
+dnl $Id$
 dnl
-dnl Copyright 2018 Karl Berry <tex-live@tug.org>
+dnl Copyright 2018-2020 Karl Berry <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries for axodraw2.
diff --git a/Build/source/utils/axodraw2/configure b/Build/source/utils/axodraw2/configure
index 3c60d0d64fa..6eef9a8b333 100755
--- a/Build/source/utils/axodraw2/configure
+++ b/Build/source/utils/axodraw2/configure
@@ -3616,9 +3616,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
-$as_echo_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for erf in -lm" >&5
+$as_echo_n "checking for erf in -lm... " >&6; }
+if ${ac_cv_lib_m_erf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -3632,27 +3632,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqrt ();
+char erf ();
 int
 main ()
 {
-return sqrt ();
+return erf ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_sqrt=yes
+  ac_cv_lib_m_erf=yes
 else
-  ac_cv_lib_m_sqrt=no
+  ac_cv_lib_m_erf=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
-$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_erf" >&5
+$as_echo "$ac_cv_lib_m_erf" >&6; }
+if test "x$ac_cv_lib_m_erf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
diff --git a/Build/source/utils/axodraw2/configure.ac b/Build/source/utils/axodraw2/configure.ac
index a7c325de032..1d381273530 100644
--- a/Build/source/utils/axodraw2/configure.ac
+++ b/Build/source/utils/axodraw2/configure.ac
@@ -1,7 +1,7 @@
-# $Id$
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-dnl   Copyright 2018 John Collins
+dnl $Id$
+dnl                                               -*- Autoconf -*-
+dnl Process this file with autoconf to produce a configure script.
+dnl   Copyright 2018-2020 John Collins
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4])
 
 KPSE_BASIC([axodraw2], [no-define])
 
-AC_CHECK_LIB([m], [sqrt],,
+AC_CHECK_LIB([m], [erf],,
   AC_MSG_ERROR([*** Please install libm on your system ***]))
 AC_PROG_CC
 
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index e00c94764a8..051e7071386 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3379,8 +3379,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
 ## configure options and TL libraries required for autosp.
 # Check whether --enable-autosp was given.
 if test "${enable_autosp+set}" = set; then :
@@ -3398,8 +3397,7 @@ $as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
     ;;
 esac
 
-## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
-## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
 ## configure options and TL libraries for axodraw2.
 # Check whether --enable-axodraw2 was given.
 if test "${enable_axodraw2+set}" = set; then :
@@ -3579,9 +3577,8 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
     ;;
 esac
 
-# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $
-# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
-## configure options and TL libraries required for xindy
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
   enableval=$enable_xindy;
@@ -3693,9 +3690,8 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $
-# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
-## configure options for TeX and MF
+# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
+# configure options for TeX and MF
 
 # Check whether --with-banner-add was given.
 if test "${with_banner_add+set}" = set; then :
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 2b969a0acdd..6fd49c7fcfe 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-07  Karl Berry  <karl@freefriends.org>
+
+	* ac/withenable.ac: omit $Id$ from generated output.
+
 2020-05-28  J\"urgen Spitzm\"uller  <spitz@lyx.org>
 
 	These patches from:
diff --git a/Build/source/utils/xindy/ac/withenable.ac b/Build/source/utils/xindy/ac/withenable.ac
index 29136c48e34..9cace7a5700 100644
--- a/Build/source/utils/xindy/ac/withenable.ac
+++ b/Build/source/utils/xindy/ac/withenable.ac
@@ -1,11 +1,11 @@
-# $Id$
-# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+dnl $Id$
 dnl
-dnl Copyright 2009-2018 Karl Berry <tex-live@tug.org>
+dnl Copyright 2009-2020 Karl Berry <tex-live@tug.org>
 dnl Copyright 2009-2010 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
-## configure options and TL libraries required for xindy
+## configure options and TL libraries required for xindy.
 KPSE_ENABLE_PROG([xindy], , [disable])
 m4_include(kpse_TL[utils/xindy/ac/xindy.ac])
 m4_include(kpse_TL[utils/xindy/ac/clisp.ac])