Make gnupload friendlier for VPATH usage.

* lib/gnupload: Allow uploads from separate directory.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 4ba504d2e47ea2c0cd419240d69035e2d900b5ae..2ac33db21baaa70d2569a05973728bc1123e5df3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Eric Blake  <ebb9@byu.net>
+
+       Make gnupload friendlier for VPATH usage.
+       * lib/gnupload: Allow uploads from separate directory.
+
 2008-03-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Implement conditional AC_CONFIG_FILES: AM_COND_IF.

diff --git a/lib/gnupload b/lib/gnupload
index 2e3c8014c7d14e416dce9d4c1289666986e79e5f..6621ebd8b7f6e52596b85c7e260fff256e3603e6 100755 (executable)
--- 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