# HG changeset patch
# User Karl Berry <karl@freefriends.org>
# Date 1197729692 28800
# Node ID 2215566196b7989f2284f8cff00b382f5727bb81
# Parent  27a877457cb92c9ca50c515b2cdd7b876d1e86df# Parent  defbc2a21671052041da50a9e958f6985436df1a
Merge branch 'master' of ssh://karl@git.sv.gnu.org/srv/git/gnulib

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-15  Jim Meyering  <meyering@redhat.com>
+
+	* build-aux/gnupload (GPG): Don't hard-code absolute name of gpg binary.
+
 2007-12-13  Eric Blake  <ebb9@byu.net>
 
 	Another fseek test.
diff --git a/build-aux/gnupload b/build-aux/gnupload
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2007-06-30.12
+scriptversion=2007-12-15.10
 
 # Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation
 #
@@ -24,7 +24,7 @@
 
 set -e
 
-GPG='/usr/bin/gpg --batch --no-tty'
+GPG='gpg --batch --no-tty'
 to=
 
 usage="Usage: $0 [OPTIONS]... FILES...