From: Karl Berry Date: Sun, 19 May 2019 16:57:11 +0000 (-0700) Subject: sync texinfo.tex with file on ftp.gnu.org X-Git-Tag: v1.0~4947 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f56afa9a60d407990f420439969a1903a5f0783b;p=gnulib.git sync texinfo.tex with file on ftp.gnu.org --- diff --git a/ChangeLog b/ChangeLog index 0f5500f1a2..4da6998d21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-05-19 Karl Berry + + * config/srclistvars.sh (TEXINFOTEX): make ftp.gnu.org be the + source for texinfo.tex, replacing TEXINFOSRC, per Texinfo maintainer. + * config/srclist.txt (texinfo.tex): use it. (Also doc changes.) + 2019-05-18 Akim Demaille maintainer-makefile: catch uses of $< in non-implicit rules diff --git a/config/srclist.txt b/config/srclist.txt index 23e765dabb..b86e6a57aa 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,3 +1,4 @@ +# Public domain. # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -11,7 +12,7 @@ $AUTOMAKE lib/install-sh build-aux $AUTOMAKE lib/mdate-sh build-aux $AUTOMAKE lib/mkinstalldirs build-aux -$TEXINFOSRC doc/texinfo.tex build-aux +$TEXINFOTEX texinfo.tex build-aux # we generate INSTALL from this via a rule in doc/Makefile. $AUTOCONF doc/install.texi doc @@ -45,6 +46,17 @@ $GNUORG Copyright/request-assign.future doc/Copyright $GNUORG Copyright/request-assign.program doc/Copyright $GNUORG Copyright/request-disclaim.changes doc/Copyright +$LIBCSRC include/intprops.h lib +$LIBCSRC posix/regcomp.c lib +$LIBCSRC posix/regex.c lib +$LIBCSRC posix/regex.h lib +$LIBCSRC posix/regex_internal.c lib +$LIBCSRC posix/regex_internal.h lib +$LIBCSRC posix/regexec.c lib +$LIBCSRC time/timegm.c lib +$LIBCSRC time/mktime.c lib +$LIBCSRC time/mktime-internal.h lib + # # All below here commented out in forlorn hope of future syncs. @@ -71,17 +83,6 @@ $GNUORG Copyright/request-disclaim.changes doc/Copyright #$LIBCSRC libidn/iconvme.h lib gpl #$LIBCSRC libidn/iconvme.c lib gpl -$LIBCSRC include/intprops.h lib -$LIBCSRC posix/regcomp.c lib -$LIBCSRC posix/regex.c lib -$LIBCSRC posix/regex.h lib -$LIBCSRC posix/regex_internal.c lib -$LIBCSRC posix/regex_internal.h lib -$LIBCSRC posix/regexec.c lib -$LIBCSRC time/timegm.c lib -$LIBCSRC time/mktime.c lib -$LIBCSRC time/mktime-internal.h lib -# # c89 changes $LIBCSRC/string/strdup.c lib gpl #tab changes $LIBCSRC/stdlib/strtoll.c lib gpl #tab changes $LIBCSRC/stdlib/strtoul.c lib gpl diff --git a/config/srclistvars.sh b/config/srclistvars.sh index 8fe0f26fd9..b24a8ef20a 100755 --- a/config/srclistvars.sh +++ b/config/srclistvars.sh @@ -19,11 +19,8 @@ # per-user overrides. case $LOGNAME in karl) - : ${ACLOCAL=/usr/local/gnu/share/aclocal} - : ${GNUBIN=/usr/local/gnu/bin} : ${GNUORG=$HOME/gnu/gnuorg} : ${GNUWWWLICENSES=$HOME/gnu/www/www/licenses} - : ${TEXMFROOT=/usr/local/texmf/texmf-dist} ;; esac @@ -37,4 +34,4 @@ esac : ${GNUWWWLICENSES=../www/www/licenses} : ${LIBCSRC=../libc} : ${LIBTOOL=../libtool} -: ${TEXINFOSRC=../texinfo} +: ${TEXINFOTEX=../../ftp.gnu.org/gnu/texinfo}