From 87088ee2be5728f633a0f76807bfa04d62f8a898 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 10 Jul 2002 20:54:51 +0000
Subject: [PATCH] Converted docs to SGML.

---
 Makefile   | 17 +++++++++--------
 ascii.c    |  4 ++--
 ascii.spec | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 09c247e..8133019 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # Note: When the version changes, you also have to change
 # the RPM spec file and LSM
-VERS=3.0
+VERS=3.1
 
 CFLAGS = -O
 
@@ -12,18 +12,22 @@ ascii: ascii.c splashscreen.h
 splashscreen.h: splashscreen
 	sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/' -e 's/.*/P("&");/' 
 
+ascii.1: ascii.sgml
+	docbook2man ascii.sgml 
+
 clean:
 	rm -f ascii ascii.tar* ascii.shar ascii.o splashscreen.h
+	rm -f ascii.1 manpage.*
 
-install:
+install: ascii.1
 	cp ascii /usr/bin/ascii
-	cp ascii.1 /usr/man/man1
+	cp ascii.1 /usr/share/man/man1
 
 uninstall:
 	rm /usr/bin/ascii
-	rm /usr/man/man1
+	rm /usr/share/man/man1/ascii.1
 
-SOURCES = README Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen ascii.cgi
+SOURCES = README Makefile ascii.c ascii.sgml ascii.lsm ascii.spec splashscreen ascii.cgi
 
 ascii-$(VERS).tar.gz: $(SOURCES)
 	@ls $(SOURCES) | sed s:^:ascii-$(VERS)/: >MANIFEST
@@ -31,9 +35,6 @@ ascii-$(VERS).tar.gz: $(SOURCES)
 	(cd ..; tar -czvf ascii/ascii-$(VERS).tar.gz `cat ascii/MANIFEST`)
 	@(cd ..; rm ascii-$(VERS))
 
-ascii-$(VERS).shar:
-	shar $(SOURCES) >ascii-$(VERS).shar
-
 dist: ascii-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
diff --git a/ascii.c b/ascii.c
index d94207f..cccfa20 100644
--- a/ascii.c
+++ b/ascii.c
@@ -152,7 +152,7 @@ static string cnames[128][16] =
 				"Left Angle Bracket", "Read From", "In",
 				"From", "Comesfrom", "Left Funnel",
 				"Left Broket", "Crunch", "Suck", "&lt;", 
-				"# See `<' for matching names.",
+				"# See `>' for matching names.",
 	 			 (char *)NULL},
     {"=",		"Equals Sign",
 				"Quadrathorp", "Gets", "Becomes", "Half-Mesh",
@@ -161,7 +161,7 @@ static string cnames[128][16] =
 				"Right Angle" , "Write To", "Into", "Toward",
 				"Out", "To", "Gozinta", "Right Funnel",
 				"Right Broket", "Zap", "Blow", "&gt;",
-				"# See `>' for matching names.",
+				"# See `<' for matching names.",
 	 			 (char *)NULL},
     {"?",		"Question Mark",
 				"Whatmark", "What", "Ques", (char *)NULL},
diff --git a/ascii.spec b/ascii.spec
index e79e4d7..2f64485 100644
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,7 +1,7 @@
 Name: ascii
-Version: 3.0
+Version: 3.1
 Release: 1
-Source: locke.ccil.org:/pub/esr/ascii-3.0.tar.gz
+Source: locke.ccil.org:/pub/esr/ascii-3.1.tar.gz
 Copyright: distributable
 Group: Utilities/Text
 Summary: interactive ASCII name and synonym chart
@@ -18,13 +18,13 @@ it displays a handy small ASCII chart.
 %setup
 
 %build
-make
+make ascii ascii.1
 
 %install
 rm -f /usr/bin/ascii
 cp ascii /usr/bin
-cp ascii.1 /usr/man/man1/ascii.1
+cp ascii.1 /usr/share/man/man1/ascii.1
 
 %files
-/usr/man/man1/ascii.1
+/usr/share/man/man1/ascii.1
 /usr/bin/ascii
-- 
2.43.0