Add system tmac directory (/usr/local/lib/groff/site-tmac).

* Makefile.in: Add $(libdir), $(libprogramdir), and $(systemtmacdir).
(uninstall_dirs): Add $(libdir), $(libprogramdir), and
$(systemtmacdir).
Use @libdir@.
* Makefile.comm (.man.n): Add @SYSTEMMACRODIR@.
* tmac/Makefile.sub (install_data): Create
$(systemtmacdir) and $(localtmacdir).
(uninstall_sub): Use $(systemtmacdir) for wrapper macros.
* man/roff.man, src/roff/troff/troff.man, src/roff/groff/groff.man,
NEWS, doc/groff.texinfo: Updated and minor fixes.

* Makefile.comm, Makefile.in: Added tmac_{s,an}_prefix stuff again.
* tmac/Makefile.sub: Added `wrap' stuff again, but installing into
$(systemtmacdir) since the wrapper files are platform-dependent.


* doc/groff.texinfo: Fix typo.

2 files changed, 12 insertions, 4 deletions

diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man
index d1f3efd0..16bc7ef4 100644
--- a/src/roff/groff/groff.man
+++ b/src/roff/groff/groff.man
@@ -346,7 +346,7 @@ and
 .SM
 .B GROFF_TMAC_PATH
 A colon separated list of directories in which to search for
-macro files.
+macro files in addition to the default directories.
 .TP
 .SM
 .B GROFF_TYPESETTER
@@ -356,7 +356,7 @@ Default device.
 .B GROFF_FONT_PATH
 A colon separated list of directories in which to search for the
 .BI dev name
-directory.
+directory in addition to the default one.
 .TP
 .SM
 .B GROFF_BIN_PATH
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index ba1addcf..0b883b88 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -147,7 +147,8 @@ Read in the file
 If it isn't found, try
 .BI tmac. name
 instead.
-Normally this will be searched for in @LOCALMACRODIR@ or @MACRODIR@.
+Normally this will be searched for in the current directory, @LOCALMACRODIR@,
+@SYSTEMMACRODIR@, or @MACRODIR@.
 .TP
 .B \-U
 Unsafe mode.
@@ -228,7 +229,8 @@ file and font files before the normal
 Search directory
 .I dir
 for macro files before the normal
-.B @LOCALMACRODIR@
+.BR @LOCALMACRODIR@ ,
+.BR @SYSTEMMACRODIR@ ,
 and
 .BR @MACRODIR@ .
 .SH USAGE
@@ -2191,6 +2193,12 @@ escape sequence.
 .B GROFF_TMAC_PATH
 A colon separated list of directories in which to search for
 macro files.
+.B troff
+will search in directories given in the
+.B \-M
+option before these, and in standard directories
+.RB ( @MACROPATH@ )
+after these.
 .TP
 .SM
 .B GROFF_TYPESETTER