maint.mk: allow the default upload destination dir to be overridden

* top/maint.mk (upload_dest_dir_): Define with a default that
preserves the status quo.
(emit_upload_commands): Use it, rather than hard-coding $(PACKAGE).
Reported by Peter Simons.

diff --git a/ChangeLog b/ChangeLog
index 0ebee71c00b2879d91762699d55549800534f745..8fdabc25641f0fdc1fc50db63d242aa2fac099c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-14  Jim Meyering  <meyering@redhat.com>
 
+       maint.mk: allow the default upload destination dir to be overridden
+       * top/maint.mk (upload_dest_dir_): Define with a default that
+       preserves the status quo.
+       (emit_upload_commands): Use it, rather than hard-coding $(PACKAGE).
+       Reported by Peter Simons.
+
        maint.mk: prohibit inclusion of "hash.h" without_use
        * top/maint.mk (sc_prohibit_hash_without_use): New rule.
 

diff --git a/top/maint.mk b/top/maint.mk
index a623d026e52e9905d3a5e69fc194161c0cc0e153..cfe0fd75b21ecf3f382712fa3c6ec2e31abb65b9 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -798,11 +798,12 @@ announcement: NEWS ChangeLog $(rel-files)
 ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
 
+upload_dest_dir_ ?= $(PACKAGE)
 emit_upload_commands:
        @echo =====================================
        @echo =====================================
        @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\"
-       @echo "    --to $(gnu_rel_host):$(PACKAGE) \\"
+       @echo "    --to $(gnu_rel_host):$(upload_dest_dir_) \\"
        @echo "  $(rel-files)"
        @echo '# send the ~/announce-$(my_distdir) e-mail'
        @echo =====================================