From 15baf5c05b1f1c21c9a10eeff055b88692f4402b Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 15 Oct 2004 09:34:21 +0000
Subject: [PATCH] Fix up the @setfilename lines.

---
 scripts/ChangeLog   |  4 ++++
 scripts/mk-gpg-texi | 40 ++++++++++++++--------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 8973f7acf..36cfedc61 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-15  Werner Koch  <wk@g10code.com>
+
+	* mk-gpg-texi: Fix up the @setfilename lines.
+
 2004-10-01  Werner Koch  <wk@g10code.com>
 
 	* mk-w32-dist: Updated from stable branch. 
diff --git a/scripts/mk-gpg-texi b/scripts/mk-gpg-texi
index 447d2ebec..46f7acbf8 100755
--- a/scripts/mk-gpg-texi
+++ b/scripts/mk-gpg-texi
@@ -16,32 +16,20 @@ set -e
 for file in gpg gpgv; do
    sgml2xml -x lower ${file}.sgml >${file}.xml
 #  docbook2texi ${file}.xml | sed 's,--,---,' | (
-  docbook2x-texi --to-stdout ${file}.xml >${file}.texi
-#  | (
-#    case "$file" in
-#      *gpgv)
-#          sed '/@setfilename/a \
-#  @dircategory GnuPG\
-#  @direntry\
-#  * gpgv: (gpgv).                       GnuPG signature verification tool.\
-#  @end direntry
-#  '
-#           ;;
-#  
-#      gpg)
-#          sed '/@setfilename/a \
-#  @dircategory GnuPG\
-#  @direntry\
-#  * gpg: (gpg).                         GnuPG encryption and signing tool.\
-#  @end direntry
-#  '
-#          ;;
-#  
-#      *)
-#      cat
-#          ;;
-#    esac
-#    ) >${file}.texi 
+   docbook2x-texi --to-stdout ${file}.xml | (
+  case "$file" in
+    *gpgv)
+        sed 's/^@setfilename .*/@setfilename gpgv.info/'
+         ;;
+    gpg)
+        sed 's/^@setfilename .*/@setfilename gpg.info/'
+        ;;
+
+    *)
+    cat
+        ;;
+  esac
+  ) >${file}.texi 
 
 done