gnupload tweak

[Eric Blake]

I got bit this morning when trying to release M4 from a VPATH directory; I 
ended up invoking

build-aux/gnupload build/m4-*tar*

which in turn created directive files with the invalid directive:

filename: build/m4-1.4.11.tar.gz

Is this okay to apply, so that my VPATH invocation will actually work with the 
ftp-upload.gnu.org directive files?


From: Eric Blake <address@hidden>
Date: Wed, 2 Apr 2008 13:43:56 -0600
Subject: [PATCH] Make gnupload friendlier for VPATH usage.

* lib/gnupload: Allow uploads from separate directory.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog    |    5 +++++
 lib/gnupload |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ba504d..2ac33db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Eric Blake  <address@hidden>
+
+       Make gnupload friendlier for VPATH usage.
+       * lib/gnupload: Allow uploads from separate directory.
+
 2008-03-26  Ralf Wildenhues  <address@hidden>
 
        Implement conditional AC_CONFIG_FILES: AM_COND_IF.
diff --git a/lib/gnupload b/lib/gnupload
index 2e3c801..6621ebd 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2007-12-18.17
+scriptversion=2008-04-02.19
 
-# Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008  Free Software Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@ do
        cat >$file.directive<<EOF
 version: 1.1
 directory: $destdir
-filename: $file
+filename: `basename -- "$file"`
 EOF
        echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
@@ -156,7 +156,7 @@ EOF
        cat >$file.directive<<EOF
 version: 1.1
 directory: $destdir
-filename: $file
+filename: `basename -- "$file"`
 EOF
        echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
-- 
1.5.4