From 197687e808991f9b28d3f0ea8bdc765892e66ff3 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Tue, 2 Sep 2008 06:53:38 -0600
Subject: [PATCH] Resync from gnulib.

* cfg.mk (cvs_executable_files, cvs_files): Update list of files,
although for now, they are still manually sync'd.
* build-aux/gnupload: Update.
* build-aux/config.sub: Likewise.
* GNUmakefile: Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>
---
 ChangeLog            |  9 +++++++++
 GNUmakefile          |  4 ++--
 build-aux/config.sub | 10 +++++++---
 build-aux/gnupload   |  6 +++++-
 cfg.mk               |  7 ++++++-
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35ec73ce..4a633b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-09  Eric Blake  <ebb9@byu.net>
+
+	Resync from gnulib.
+	* cfg.mk (cvs_executable_files, cvs_files): Update list of files,
+	although for now, they are still manually sync'd.
+	* build-aux/gnupload: Update.
+	* build-aux/config.sub: Likewise.
+	* GNUmakefile: Likewise.
+
 2008-09-06  Eric Blake  <ebb9@byu.net>
 
 	Mention that Automake already supports VPATH.
diff --git a/GNUmakefile b/GNUmakefile
index 7635e8dc..4b4cf15c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -53,9 +53,9 @@ _autoreconf ?= autoreconf
 _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, \
+  _is-dist-target ?= $(filter-out %clean, \
     $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
-  _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+  _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target)$(_is-install-target))
     _curr-ver := $(shell cd $(srcdir) \
                    && $(_build-aux)/git-version-gen .tarball-version)
diff --git a/build-aux/config.sub b/build-aux/config.sub
index a649350a..053e7381 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-06-16'
+timestamp='2008-09-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -288,7 +288,7 @@ case $basic_machine in
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -375,7 +375,7 @@ case $basic_machine in
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -1140,6 +1140,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 6621ebd8..b90e3ae2 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -45,7 +45,11 @@ Recognized destinations are:
                            build directive files and upload files by FTP
   [user@]host:DIRECTORY    upload files with scp
 
-Example:
+Simple single-target single-file examples:
+  gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz
+  gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz
+
+Multiple-target multiple-file example:
   gnupload --to sources.redhat.com:~ftp/pub/automake \\
            --to alpha.gnu.org:automake \\
            automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
diff --git a/cfg.mk b/cfg.mk
index 773c335b..54da291c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,18 +40,23 @@ gpg_key_ID = F4850180
 
 # Files to update automatically.
 cvs_executable_files = \
+  $(srcdir)/build-aux/announce-gen \
   $(srcdir)/build-aux/config.guess \
   $(srcdir)/build-aux/config.sub \
   $(srcdir)/build-aux/elisp-comp \
+  $(srcdir)/build-aux/git-version-gen \
+  $(srcdir)/build-aux/gnupload \
   $(srcdir)/build-aux/install-sh \
   $(srcdir)/build-aux/mdate-sh \
   $(srcdir)/build-aux/missing \
+  $(srcdir)/build-aux/vc-list-files
 
 cvs_files = $(cvs_executable_files) \
   $(srcdir)/build-aux/texinfo.tex \
   $(srcdir)/doc/fdl.texi \
   $(srcdir)/doc/make-stds.texi \
-  $(srcdir)/doc/standards.texi
+  $(srcdir)/doc/standards.texi \
+  $(srcdir)/GNUmakefile
 
 # Keep executables executable.  Make it robust to parallel makes.
 local_updates = executable-update
-- 
2.47.2