guidebook building command

I found that the setting of GUIDECMD sys/unix/Makefile.doc didn't cut
it with groff-1.18.  Also, the command was duplicated in the rule to
generate Guidebook.txt.

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 338b3443d1059cd99348c5faebb5112b78d55755..65edf9782dfa161e64c45bfbcc4ac6544c33e3cc 100644 (file)
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -112,6 +112,7 @@ tiles: high priest tile had a couple bad pixels
 tiles: bad pixels in Croesus and Yeenoghu tiles
 FreeBSD: incorrect srandom declaration
 unix: don't autosave if hangup occurs after game is over
+linux: add example use of nroff on recent Linux distros
 
 
 General New Features

diff --git a/sys/unix/Makefile.doc b/sys/unix/Makefile.doc
index 076b2ba53f6b954774ca50d83690d6afacb1d874..647e90ae00d97cace8004e7b301686aec7a151be 100644 (file)
--- a/sys/unix/Makefile.doc
+++ b/sys/unix/Makefile.doc
@@ -19,7 +19,10 @@ COLCMD = col -bx
 PSCMD = groff
 
 # Use the "cat" GUIDECMD if nroff and/or tbl and/or col are not installed
+# Not appropriate for creating Guidebook.txt.
 # GUIDECMD = cat Guidebook.txt
+# The following works better with groff-1.18, eg on Linux
+# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
 GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
 
 # the basic guidebook
@@ -68,7 +71,7 @@ distrib: $(DISTRIB)
        @echo "Plain text documentation is up to date."
 
 Guidebook.txt  : Guidebook.mn tmac.n
-       tbl tmac.n Guidebook.mn | nroff | $(COLCMD) > Guidebook.txt
+       $(GUIDECMD) > Guidebook.txt
 nethack.txt    : nethack.6
        nroff -man nethack.6 | $(COLCMD) > nethack.txt
 lev_comp.txt   : lev_comp.6