Converted docs to SGML.

diff --git a/Makefile b/Makefile
index 09c247eaf78200ef48fee65467bb2d0eaf3fb721..813301922d640926907d044446943fb3ec3d313a 100644 (file)
--- 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 d94207f2c3026b09d9bdb60b64d6188166baedd8..cccfa207728f083d832daeada302e673b962a0a5 100644 (file)
--- 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", "<", 
-                               "# 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 e79e4d72712ed16c9ca5e5272aadc4a9b4e9ad4c..2f64485696a3ecd9b6efda3f71f8daaa0b072f1c 100644 (file)
--- 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