Makefile: (1) include TEXINPUTS defn to point to texinfo.tex when calling tex

          (2) new target as.ms (roff)
as.texinfo: sed-markers to make roff output pick up less-fancy form of
          tables and illustrations (otherwise used by info, not TeX);
          slight text chgs as workarounds for texi2roff bugs

diff --git a/gas/doc/Makefile b/gas/doc/Makefile
index e44752884f2509f73ce05d3e0cd58f40c5e777d0..e06fa42c2a8a39a24d1e5a8787ee710776d63a3a 100755 (executable)
--- a/gas/doc/Makefile
+++ b/gas/doc/Makefile
@@ -1,21 +1,42 @@
-# Makefile fragment for as.texinfo preprocessing and TeXing
+# Makefile for as.texinfo preprocessing and TeXing
 # $Id$
 # see pretex.m4 for discussion of preprocessor definitions
 
+# What version of the manual you want (see *.m4); "all" includes everything
+CONFIG=all
+
 # Sun/Berkeley m4 doesn't have all the things we need; use GNU or sV
 #M4=gm4
 M4=/usr/5bin/m4
 
-# What version of the manual you want (see *.m4); "all" includes everything
-CONFIG=all
+# Directory for gas source
+srcdir=..
+
+# Where to find texinfo.tex to format docn with TeX
+TEXIDIR = $(srcdir)/../texinfo/fsf
 
 # There's no index yet; when there is, add texindex call before tex 2nd pass
 as.dvi:        as-${CONFIG}.texinfo
-       tex as-${CONFIG}.texinfo
-       tex as-${CONFIG}.texinfo
+       TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex as-${CONFIG}.texinfo
+       TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex as-${CONFIG}.texinfo
        mv as-${CONFIG}.dvi as.dvi
        rm as-${CONFIG}.?? as-${CONFIG}.???
 
+as.info: as-${CONFIG}.texinfo
+       makeinfo as-${CONFIG}.texinfo
+
+# roff output (-ms)
+#edit instances of "ms" to "me" or "mm" to suit your preferences.
+# (we don't use a variable because we don't trust all makes to handle
+# a var in the target name right).
+as.ms: as-${CONFIG}.texinfo
+       sed -e '/\\input texinfo/d' \
+               -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
+               as-${CONFIG}.texinfo | \
+       texi2roff -ms >as.ms 
+
+
+
 as-all.texinfo: as.texinfo pretex.m4 none.m4 all.m4
        ${M4} pretex.m4 none.m4 all.m4 as.texinfo >as-all.texinfo