Update gnulib files.

diff --git a/GNUmakefile b/GNUmakefile
index ea5e72c44e0635c5aef1c787087f3a381724700c..8b64c49dd918a34b4d6f451ec5bbc436d8fd51bd 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -62,19 +62,21 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
     ifneq ($(_curr-ver),$(VERSION))
       ifeq ($(_curr-ver),UNKNOWN)
         $(info WARNING: unable to verify if $(VERSION) is correct version)
-      else ifneq (,$(_is-install-target))
-        # GNU Coding Standards state that 'make install' should not cause
-        # recompilation after 'make all'.  But as long as changing the version
-        # string alters config.h, the cost of having 'make all' always have an
-        # up-to-date version is prohibitive.  So, as a compromise, we merely
-        # warn when installing a version string that is out of date; the user
-        # should run 'autoreconf' (or something like 'make distcheck') to
-        # fix the version, 'make all' to propagate it, then 'make install'.
-        $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it)
       else
-        $(info INFO: running autoreconf for new version string: $(_curr-ver))
-        _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
-          && $(_autoreconf))
+       ifneq (,$(_is-install-target))
+         # GNU Coding Standards state that 'make install' should not cause
+         # recompilation after 'make all'.  But as long as changing the version
+         # string alters config.h, the cost of having 'make all' always have an
+         # up-to-date version is prohibitive.  So, as a compromise, we merely
+         # warn when installing a version string that is out of date; the user
+         # should run 'autoreconf' (or something like 'make distcheck') to
+         # fix the version, 'make all' to propagate it, then 'make install'.
+         $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it)
+       else
+         $(info INFO: running autoreconf for new version string: $(_curr-ver))
+         _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
+           && $(_autoreconf))
+       endif
       endif
     endif
   endif

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 6621ebd8b7f6e52596b85c7e260fff256e3603e6..b90e3ae231224e37ca8fac88162995a9edf846f7 100755 (executable)
--- 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