maint.mk: improve the release procedure

[Akim Demaille]

There is still the uploading step which is not bound to a make target.  I would 
remove the emit_upload_command completely, and instead mention the upload 
target in README-release, including the announcement step, WDYT?

commit 0987dee3270299009103409818f2c5ea22a87aa6
Author: Akim Demaille <address@hidden>
Date:   Fri Aug 3 10:09:44 2012 +0200

    maint.mk: improve the release procedure
    
    * top/maint.mk (writable-files): Use $(AM_V_GEN).
    (announcement): Do not.
    (upload_command, upload): New.
    (emit_upload_commands): Adjust.

diff --git a/ChangeLog b/ChangeLog
index a5aca2f..8304b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-03  Akim Demaille  <address@hidden>
+
+       maint.mk: improve the release procedure
+       * top/maint.mk (writable-files): Use $(AM_V_GEN).
+       (announcement): Do not.
+       (upload_command, upload): New.
+       (emit_upload_commands): Adjust.
+
 2012-08-01  Akim Demaille  <address@hidden>
 
        maint.mk: a "release-commit" wrapper to do-release-commit-and-tag
diff --git a/top/maint.mk b/top/maint.mk
index bdc4502..b21fb70 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1134,7 +1134,7 @@ sc_makefile_path_separator_check:
 # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
 # and is read-only.
 writable-files:
-       if test -d $(release_archive_dir); then                         \
+       $(AM_GEN)if test -d $(release_archive_dir); then                \
          for file in $(DIST_ARCHIVES); do                              \
            for p in ./ $(release_archive_dir)/; do                     \
              test -e $$p$$file || continue;                            \
@@ -1279,7 +1279,10 @@ else
 endif
 
 announcement: NEWS ChangeLog $(rel-files)
-       $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen                 \
+# Do not use $(AM_V_GEN) here, or remove @, since the output of this
+# command serves as annoucement message: it would start with " GEN
+# announcement".
+       @$(srcdir)/$(_build-aux)/announce-gen                           \
            --mail-headers='$(announcement_mail_headers_)'              \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
@@ -1308,16 +1311,23 @@ ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
 
 upload_dest_dir_ ?= $(PACKAGE)
+upload_command =                                               \
+  $(if $(RELEASE_TYPE),,$(error RELEASE_TYPE undefined))       \
+  $(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS)            \
+  --to $(gnu_rel_host):$(upload_dest_dir_)                     \
+  $(rel-files)
 emit_upload_commands:
        @echo =====================================
        @echo =====================================
-       @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\"
-       @echo "    --to $(gnu_rel_host):$(upload_dest_dir_) \\"
-       @echo "  $(rel-files)"
+       @echo '$(upload_command)'
        @echo '# send the ~/announce-$(my_distdir) e-mail'
        @echo =====================================
        @echo =====================================
 
+.PHONY: upload
+upload:
+       $(AM_V_GEN)$(upload_command)
+
 define emit-commit-log
   printf '%s\n' 'maint: post-release administrivia' ''                 \
     '* NEWS: Add header line for next release.'                                
\