diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rwxr-xr-x | build-aux/config.guess | 5 | ||||
| -rwxr-xr-x | build-aux/config.sub | 4 | ||||
| -rwxr-xr-x | build-aux/gendocs.sh | 13 | ||||
| -rwxr-xr-x | build-aux/git-version-gen | 7 | ||||
| -rw-r--r-- | build-aux/texinfo.tex | 43 | ||||
| -rw-r--r-- | doc/make-stds.texi | 15 | ||||
| -rw-r--r-- | lib/Autom4te/Channels.pm | 2 | ||||
| -rw-r--r-- | lib/Autom4te/Configure_ac.pm | 2 | ||||
| -rw-r--r-- | lib/Autom4te/FileUtils.pm | 2 | ||||
| -rw-r--r-- | lib/Autom4te/Struct.pm | 4 | ||||
| -rw-r--r-- | lib/Autom4te/XFile.pm | 2 |
13 files changed, 73 insertions, 42 deletions
@@ -1,5 +1,19 @@ 2011-01-04 Eric Blake <eblake@redhat.com> + maint: resync upstream files + * GNUmakefile: Regenerated by 'make fetch'. + * build-aux/config.guess: Likewise. + * build-aux/config.sub: Likewise. + * build-aux/gendocs.sh: Likewise. + * build-aux/git-version-gen: Likewise. + * build-aux/texinfo.tex: Likewise. + * doc/make-stds.texi: Likewise. + * lib/Autom4te/Channels.pm: Likewise. + * lib/Autom4te/Configure_ac.pm: Likewise. + * lib/Autom4te/FileUtils.pm: Likewise. + * lib/Autom4te/Struct.pm: Likewise. + * lib/Autom4te/XFile.pm: Likewise. + maint: document use of copyright ranges * README: Copy coreutils wording for allowing copyright year ranges. diff --git a/GNUmakefile b/GNUmakefile index 97fea365..0394d986 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -57,7 +57,7 @@ _have-git-version-gen := \ $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes) ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _is-dist-target ?= $(filter-out %clean, \ - $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) + $(filter maintainer-% dist% alpha beta stable,$(MAKECMDGOALS))) _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)$(_is-install-target)) _curr-ver := $(shell cd $(srcdir) \ diff --git a/build-aux/config.guess b/build-aux/config.guess index 28523784..4c8f032e 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-08-21' +timestamp='2010-09-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1234,6 +1234,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; diff --git a/build-aux/config.sub b/build-aux/config.sub index 320e3038..3ec94f18 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-09-11' +timestamp='2010-12-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -539,7 +539,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index 3c5ca768..34ef112e 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,10 +2,10 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2010-09-17.07 +scriptversion=2010-11-29.11 -# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,6 +22,13 @@ scriptversion=2010-09-17.07 # # Original author: Mohit Agarwal. # Send bug reports and any other correspondence to bug-texinfo@gnu.org. +# +# The latest version of this script, and the companion template, is +# available from Texinfo CVS: +# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh +# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs_template +# +# An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib). prog=`basename "$0"` srcdir=`pwd` diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 5617eb8d..795a98b3 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2010-06-14.19; # UTC +scriptversion=2010-10-13.20; # UTC # Copyright (C) 2007-2010 Free Software Foundation, Inc. # @@ -98,7 +98,10 @@ fi if test -n "$v" then : # use $v -elif test -d .git \ +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ || git describe --abbrev=4 HEAD 2>/dev/null` \ && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index f472b653..1130b8fc 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2010-09-06.17} +\def\texinfoversion{2010-12-23.17} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -6891,25 +6891,28 @@ end } \fi -\def\scanmacro#1{% - \begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % ... and \example - \spaceisspace - % - % Append \endinput to make sure that TeX does not see the ending newline. - % I've verified that it is necessary both for e-TeX and for ordinary TeX - % --kasal, 29nov03 - \scantokens{#1\endinput}% - \endgroup -} +\def\scanmacro#1{\begingroup + \newlinechar`\^^M + \let\xeatspaces\eatspaces + % + % Undo catcode changes of \startcontents and \doprintindex + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % + % ... and for \example: + \spaceisspace + % + % The \empty here causes a following catcode 5 newline to be eaten + % as part of reading whitespace after a control sequence. It does + % not eat a catcode 13 newline. There's no good way to handle the + % two cases. See the Macro Details node in the manual for the + % workaround we currently have to recommend for macros and + % line-oriented commands. + \scantokens{#1\empty}% +\endgroup} \def\scanexp#1{% \edef\temp{\noexpand\scanmacro{#1}}% diff --git a/doc/make-stds.texi b/doc/make-stds.texi index 6c83b5d5..cdcbb682 100644 --- a/doc/make-stds.texi +++ b/doc/make-stds.texi @@ -715,8 +715,9 @@ documentation format) files should be made only when explicitly asked for. By default, the Make rules should compile and link with @samp{-g}, so -that executable programs have debugging symbols. Users who don't mind -being helpless can strip the executables later if they wish. +that executable programs have debugging symbols. Otherwise, you are +essentially helpless in the face of a crash, and it is often far from +easy to reproduce with a fresh build. @item install Compile the program and copy the executables, libraries, and so on to @@ -724,8 +725,11 @@ the file names where they should reside for actual use. If there is a simple test to verify that a program is properly installed, this target should run that test. -Do not strip executables when installing them. Devil-may-care users can -use the @code{install-strip} target to do that. +Do not strip executables when installing them. This helps eventual +debugging that may be needed later, and nowadays disk space is cheap +and dynamic loaders typically ensure debug sections are not loaded during +normal execution. Users that need stripped binaries may invoke the +@code{install-strip} target to do that. If possible, write the @code{install} target rule so that it does not modify anything in the directory where the program was built, provided @@ -837,10 +841,7 @@ the program has no bugs. However, it can be reasonable to install a stripped executable for actual execution while saving the unstripped executable elsewhere in case there is a bug. -@comment The gratuitous blank line here is to make the table look better -@comment in the printed Make manual. Please leave it in. @item clean - Delete all files in the current directory that are normally created by building the program. Also delete files in other directories if they are created by this makefile. However, don't delete the files that diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm index 0af4d008..1f668b19 100644 --- a/lib/Autom4te/Channels.pm +++ b/lib/Autom4te/Channels.pm @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ############################################################### -# The main copy of this file is in Automake's CVS repository. # +# The main copy of this file is in Automake's git repository. # # Updates should be sent to automake-patches@gnu.org. # ############################################################### diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm index c8c63fdb..a81fe786 100644 --- a/lib/Autom4te/Configure_ac.pm +++ b/lib/Autom4te/Configure_ac.pm @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ############################################################### -# The main copy of this file is in Automake's CVS repository. # +# The main copy of this file is in Automake's git repository. # # Updates should be sent to automake-patches@gnu.org. # ############################################################### diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm index 8d2b3e53..150db338 100644 --- a/lib/Autom4te/FileUtils.pm +++ b/lib/Autom4te/FileUtils.pm @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ############################################################### -# The main copy of this file is in Automake's CVS repository. # +# The main copy of this file is in Automake's git repository. # # Updates should be sent to automake-patches@gnu.org. # ############################################################### diff --git a/lib/Autom4te/Struct.pm b/lib/Autom4te/Struct.pm index d352e522..9da77199 100644 --- a/lib/Autom4te/Struct.pm +++ b/lib/Autom4te/Struct.pm @@ -1,5 +1,5 @@ # autoconf -- create `configure' using m4 macros -# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ # we would have two packages defining the same symbols. Boom. ############################################################### -# The main copy of this file is in Automake's CVS repository. # +# The main copy of this file is in Automake's git repository. # # Updates should be sent to automake-patches@gnu.org. # ############################################################### diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm index 0e39763f..6800c485 100644 --- a/lib/Autom4te/XFile.pm +++ b/lib/Autom4te/XFile.pm @@ -17,7 +17,7 @@ # Written by Akim Demaille <akim@freefriends.org>. ############################################################### -# The main copy of this file is in Automake's CVS repository. # +# The main copy of this file is in Automake's git repository. # # Updates should be sent to automake-patches@gnu.org. # ############################################################### |