$NetBSD: patch-aa,v 1.1 2003/09/30 15:39:59 hfath Exp $

--- doc/makefile.orig	Wed Jan 12 15:43:22 1994
+++ doc/makefile
@@ -1,39 +1,37 @@
-TROFF=groff
+TROFF?=groff
+NROFF?=nroff
+PIC?=pic
 PRINTER= lpr
 PREREQS= macros title install flow interface dirs config ctlfiles \
  log biblio trouble tune b-to-c ihave rfcerrata problems vms \
  ctlmsg libs
 FILES= guide
 
-all: guide.ps index.ps toc.ps
+all: guide.more guide.ps index.ps toc.ps
 
 guide.ps index.raw: $(FILES) ihave.pic $(PREREQS)
 	soelim $(FILES) | tbl | $(TROFF) -ms -mpic >guide.ps 2>index.raw
 
-preview index.raw: $(FILES) ihave.pic $(PREREQS)
-	soelim $(FILES) | tbl | xproof -ms -mpic 2>index.raw
+guide.more: $(FILES) flow $(PREREQS)
+	soelim guide | tbl | ${NROFF} -ms -mpic - >$@ 2>index.out
 
-guide.out: $(FILES) flow $(PREREQS)
-	soelim guide | tbl | nroff -Tdumb -ms -mpic - >$@
 flow: flow.pic.in flow.pic
-	soelim flow.pic.in | pic >$@
-flow.pic: flow.xpic
-	-x2pic <flow.xpic | sed '/^\.PS/s/$$/ 5/' >$@
-
-#ihave.pic.in:  ihave.xpic
-#	x2pic <ihave.xpic >$@
+	soelim flow.pic.in | ${PIC} >$@
 
 ihave.pic:  ihave.pic.in
 	pic ihave.pic.in >$@
 
 clean:
-	rm -f *.pic *.ps index.raw flow
+	rm -f *.ps *.more index.raw index.out flow
 
 toc.ps: index.raw toc.start toc.end toc.awk
-	(cat toc.start; toc.awk index.raw; cat toc.end) | tbl | $(TROFF) -ms -mpic >$@
+	(cat toc.start; ./toc.awk index.raw; cat toc.end) | \
+	tbl | $(TROFF) -ms -mpic >$@
 
 # Copyright 1985, Massachusetts Institute of Technology
 # based on Makefile for the Xlib document.
 
 index.ps: index.raw fixindex.awk block.awk indexmacros.t end.t
-	sed -n '/^index:/s///p' index.raw | sort -ft: +1 -3 +0n -1 | awk -f fixindex.awk | awk -f block.awk | $(TROFF) -ms -mpic indexmacros.t - end.t >$@
+	sed -n '/^index:/s///p' index.raw | sort -ft: +1 -3 +0n -1 | \
+	awk -f fixindex.awk | awk -f block.awk | \
+	$(TROFF) -ms -mpic indexmacros.t - end.t >$@ 2>index.out