From d2ec72e374b085c722e9709d82c943d686809f38 Mon Sep 17 00:00:00 2001
From: sam <sam@55e467fa-43c5-0310-a8a2-de718669efc6>
Date: Sun, 28 Sep 2003 11:15:47 +0000
Subject: [PATCH]   * Fixed a couple of $(srcdir) / $(builddir) mistakes in the
 doc rules.

git-svn-id: svn://svn.zoy.org/elk/trunk@218 55e467fa-43c5-0310-a8a2-de718669efc6
---
 doc/bitstring/Makefile.am | 27 ++++++++++++++-------------
 doc/cprog/Makefile.am     | 22 ++++++++++++----------
 doc/kernel/Makefile.am    | 27 ++++++++++++++-------------
 doc/man/Makefile.am       |  4 ++--
 doc/oops/Makefile.am      | 27 ++++++++++++++-------------
 doc/record/Makefile.am    | 27 ++++++++++++++-------------
 doc/regexp/Makefile.am    | 27 ++++++++++++++-------------
 doc/unix/Makefile.am      | 27 ++++++++++++++-------------
 doc/usenix/Makefile.am    | 17 +++++++++--------
 doc/xlib/Makefile.am      | 27 ++++++++++++++-------------
 doc/xt/Makefile.am        | 27 ++++++++++++++-------------
 11 files changed, 135 insertions(+), 124 deletions(-)

diff --git a/doc/bitstring/Makefile.am b/doc/bitstring/Makefile.am
index e9cbfe6..b988572 100644
--- a/doc/bitstring/Makefile.am
+++ b/doc/bitstring/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = bitstring.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= bitstring
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/bitstring.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-bitstring.ps: bitstring.ms index.ms
-	(cat bitstring.ms ../util/tmac.index index.ms; echo ".Tc")\
+bitstring.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > bitstring.ps
 
-bitstring.html: bitstring.ms
+bitstring.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=bitstring
 
-index.ms: bitstring.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: bitstring.ms
-	$(TROFF) bitstring.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] bitstring.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/cprog/Makefile.am b/doc/cprog/Makefile.am
index 31efbce..d40d435 100644
--- a/doc/cprog/Makefile.am
+++ b/doc/cprog/Makefile.am
@@ -6,28 +6,30 @@ doc_DATA = cprog.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-TROFF= groff -ms -t
-UNROFF= unroff -ms
-MKINDEX= $(AWK) -f ../util/mkindex.awk
+MANUAL = $(srcdir)/cprog.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
+MKINDEX = $(AWK) -f $(srcdir)/../util/mkindex.awk
 
-cprog.ps: cprog.ms side.ref side.inx
-	$(MKINDEX) cprog.ms | sed -f side.ref | $(TROFF) 2> /dev/null > $@
+cprog.ps: $(MANUAL) side.ref side.inx
+	$(MKINDEX) $(MANUAL) | sed -f side.ref | $(TROFF) 2> /dev/null > $@
 
 side.ref: side
 	grep '^[sS]' < side | sed -e 's/\.\//\//' > side.ref
 
 side.inx: side
 	egrep -v '^s' side | sort -f -t'#' +1 -3 +0n | \
-	    $(AWK) -f ../util/fixindex.awk | $(AWK) -f ../util/block.awk \
+	    $(AWK) -f $(srcdir)/../util/fixindex.awk | \
+	    $(AWK) -f $(srcdir)/../util/block.awk \
 	    > side.inx
 
-side: cprog.ms
+side: $(MANUAL)
 	rm -f side side.inx && printf "" > side.inx
 	$(MKINDEX) $? | $(TROFF) 2>side >/dev/null
 
-cprog.html: cprog.ms side.ref
-	$(MKINDEX) cprog.ms | sed -f side.ref | $(UNROFF) document=cprog
+cprog.html: $(MANUAL) side.ref
+	$(MKINDEX) $(MANUAL) | sed -f side.ref | $(UNROFF) document=cprog
 
 check:
-	cknr -c.Tc -a.Es.Ee.Cs.Ce cprog.ms
+	cknr -c.Tc -a.Es.Ee.Cs.Ce $(MANUAL)
 
diff --git a/doc/kernel/Makefile.am b/doc/kernel/Makefile.am
index c650c4d..bbcb516 100644
--- a/doc/kernel/Makefile.am
+++ b/doc/kernel/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = kernel.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= kernel
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/kernel.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-kernel.ps: kernel.ms index.ms
-	(cat kernel.ms ../util/tmac.index index.ms; echo ".Tc")\
+kernel.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > kernel.ps
 
-kernel.html: kernel.ms
+kernel.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=kernel
 
-index.ms: kernel.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: kernel.ms
-	$(TROFF) kernel.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] kernel.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1943736..d2d5619 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -11,10 +11,10 @@ endif
 TROFF= groff -man -t
 UNROFF= unroff -man
 
-elk.ps: elk.1
+elk.ps: $(srcdir)/elk.1
 	$(TROFF) $? > $@
 
-elk.1.html: elk.1
+elk.1.html: $(srcdir)/elk.1
 	$(UNROFF) $?
 
 install-data-hook:
diff --git a/doc/oops/Makefile.am b/doc/oops/Makefile.am
index dfdd001..5d7e98d 100644
--- a/doc/oops/Makefile.am
+++ b/doc/oops/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = oops.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= oops
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/oops.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-oops.ps: oops.ms index.ms
-	(cat oops.ms ../util/tmac.index index.ms; echo ".Tc")\
+oops.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > oops.ps
 
-oops.html: oops.ms
+oops.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=oops
 
-index.ms: oops.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: oops.ms
-	$(TROFF) oops.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] oops.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/record/Makefile.am b/doc/record/Makefile.am
index 55bc9de..3884171 100644
--- a/doc/record/Makefile.am
+++ b/doc/record/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = record.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= record
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/record.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-record.ps: record.ms index.ms
-	(cat record.ms ../util/tmac.index index.ms; echo ".Tc")\
+record.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > record.ps
 
-record.html: record.ms
+record.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=record
 
-index.ms: record.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: record.ms
-	$(TROFF) record.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] record.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/regexp/Makefile.am b/doc/regexp/Makefile.am
index 7cc5a30..51b3f47 100644
--- a/doc/regexp/Makefile.am
+++ b/doc/regexp/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = regexp.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= regexp
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/regexp.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-regexp.ps: regexp.ms index.ms
-	(cat regexp.ms ../util/tmac.index index.ms; echo ".Tc")\
+regexp.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > regexp.ps
 
-regexp.html: regexp.ms
+regexp.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=regexp
 
-index.ms: regexp.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: regexp.ms
-	$(TROFF) regexp.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] regexp.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/unix/Makefile.am b/doc/unix/Makefile.am
index ec3d70d..017e1cb 100644
--- a/doc/unix/Makefile.am
+++ b/doc/unix/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = unix.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= unix
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/unix.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-unix.ps: unix.ms index.ms
-	(cat unix.ms ../util/tmac.index index.ms; echo ".Tc")\
+unix.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > unix.ps
 
-unix.html: unix.ms
+unix.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=unix
 
-index.ms: unix.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: unix.ms
-	$(TROFF) unix.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] unix.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/usenix/Makefile.am b/doc/usenix/Makefile.am
index 538e7f0..e1a767f 100644
--- a/doc/usenix/Makefile.am
+++ b/doc/usenix/Makefile.am
@@ -6,15 +6,16 @@ doc_DATA = usenix.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-TROFF= groff -ms
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/usenix.ms
+TROFF = groff -ms
+UNROFF = unroff -ms
 
-usenix.ps: usenix.ms tmp.ref
-	sed -f tmp.ref usenix.ms | $(TROFF) 2> /dev/null > usenix.ps
+usenix.ps: $(MANUAL) tmp.ref
+	sed -f tmp.ref $(MANUAL) | $(TROFF) 2> /dev/null > usenix.ps
 
-usenix.html: usenix.ms tmp.ref
-	sed -f tmp.ref usenix.ms | $(UNROFF) document=usenix
+usenix.html: $(MANUAL) tmp.ref
+	sed -f tmp.ref $(MANUAL) | $(UNROFF) document=usenix
 
-tmp.ref: usenix.ms
-	$(TROFF) usenix.ms 2> tmp.ref >/dev/null
+tmp.ref: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> tmp.ref >/dev/null
 
diff --git a/doc/xlib/Makefile.am b/doc/xlib/Makefile.am
index c27c230..ec7224f 100644
--- a/doc/xlib/Makefile.am
+++ b/doc/xlib/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = xlib.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= xlib
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/xlib.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-xlib.ps: xlib.ms index.ms
-	(cat xlib.ms ../util/tmac.index index.ms; echo ".Tc")\
+xlib.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > xlib.ps
 
-xlib.html: xlib.ms
+xlib.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=xlib
 
-index.ms: xlib.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: xlib.ms
-	$(TROFF) xlib.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] xlib.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"
 
diff --git a/doc/xt/Makefile.am b/doc/xt/Makefile.am
index 2e50784..f705f6f 100644
--- a/doc/xt/Makefile.am
+++ b/doc/xt/Makefile.am
@@ -6,25 +6,26 @@ doc_DATA = xt.ps
 docdir = $(datadir)/doc/@PACKAGE@/ps
 endif
 
-MANUAL= xt
-TROFF= groff -ms -t
-UNROFF= unroff -ms
+MANUAL = $(srcdir)/xt.ms
+TROFF = groff -ms -t
+UNROFF = unroff -ms
 
-xt.ps: xt.ms index.ms
-	(cat xt.ms ../util/tmac.index index.ms; echo ".Tc")\
+xt.ps: $(MANUAL) index.ms
+	(cat $(MANUAL) $(srcdir)/../util/tmac.index index.ms; echo ".Tc") \
 	    | $(TROFF) 2> /dev/null > xt.ps
 
-xt.html: xt.ms
+xt.html: $(MANUAL)
 	(cat $?; echo ".Tc") | $(UNROFF) document=xt
 
-index.ms: xt.ms index.raw
-	sort -f -t'#' +1 -3 +0n index.raw | $(AWK) -f ../util/fixindex.awk\
-	    | $(AWK) -f ../util/block.awk >index.ms
+index.ms: $(MANUAL) index.raw
+	sort -f -t'#' +1 -3 +0n index.raw \
+	    | $(AWK) -f $(srcdir)/../util/fixindex.awk \
+	    | $(AWK) -f $(srcdir)/../util/block.awk >index.ms
 
-index.raw: xt.ms
-	$(TROFF) xt.ms 2> index.raw >/dev/null
+index.raw: $(MANUAL)
+	$(TROFF) $(MANUAL) 2> index.raw >/dev/null
 
 check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] xt.ms |\
-	    grep -v "Empty command"
+	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+	    | grep -v "Empty command"