Peter Simons wrote:
> I'm using gnulib for the autoconf-archive project. To upload a new release,
> I have to use the following invocation of gnupload:
>
> ./build-aux/gnupload --to dl.sv.nongnu.org:/releases/autoconf-archive/
> file1 file2 ...
>
> Now, it doesn't seem possible to configure gnulib's emit_upload_commands
> target to produce that command correctly. I've tried setting $(gnu_rel_host)
> to "dl.sv.nongnu.org:/releases/autoconf-archive/", but unfortunately
> emit_upload_commands appends the contents of $(PACKAGE) to that variable
> unconditionally:
>
> emit_upload_commands:
> @echo =====================================
> @echo =====================================
> @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\"
> @echo " --to $(gnu_rel_host):$(PACKAGE) \\"
> @echo " $(rel-files)"
> @echo '# send the ~/announce-$(my_distdir) e-mail'
> @echo =====================================
> @echo =====================================
>
> In case of the Autoconf Archive, the outcome of "$(gnu_rel_host):$(PACKAGE)"
> is never going to be correct, because there of the '/releases' bit at the
> beginning of the path.
>
> Does anyone have a suggestion how to best remedy that problem?
Hi Peter,
How about this?
>From 01944b9984e7a297829374dfbb35aadbc559102a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sun, 14 Feb 2010 16:42:22 +0100
Subject: [PATCH] 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.
---
ChangeLog | 6 ++++++
top/maint.mk | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ebee71..8fdabc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-02-14 Jim Meyering <meyer...@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 a623d02..cfe0fd7 100644
--- 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 =====================================
--
1.7.0.169.g57c99
