From: cohrs <cohrs>
Date: Thu, 12 Jun 2003 05:16:20 +0000 (+0000)
Subject: guidebook building command
X-Git-Tag: MOVE2GIT~1925
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a686589b1f5d2e204dc8ae11779845064cda095a;p=nethack

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 338b3443d..65edf9782 100644
--- 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 076b2ba53..647e90ae0 100644
--- 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