Add local tmac directory (groff/site-tmac).

* Makefile.in: Add $(localtmacdir).
(uninstall_dirs): Add $(localtmacdir).
* Makefile.comm (.man.n): Add @LOCALMACRODIR@.
* tmac/Makefile.sub (install_data, uninstall_sub): Handle man.local
in $(localtmacdir).  Create $(localtmacdir).
* man/roff.man, src/roff/troff/troff.man, NEWS: Updated.

8 files changed, 49 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 8376c42a..8e29230e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-10-24  Werner LEMBERG  <wl@gnu.org>
+
+	Add local tmac directory (groff/site-tmac).
+
+	* Makefile.in: Add $(localtmacdir).
+	(uninstall_dirs): Add $(localtmacdir).
+	* Makefile.comm (.man.n): Add @LOCALMACRODIR@.
+	* tmac/Makefile.sub (install_data, uninstall_sub): Handle man.local
+	in $(localtmacdir).  Create $(localtmacdir).
+	* man/roff.man, src/roff/troff/troff.man, NEWS: Updated.
+
 2000-10-23  Werner LEMBERG  <wl@gnu.org>
 
 	Move hyphen.us to tmac directory.
diff --git a/Makefile.comm b/Makefile.comm
index 6aec3d92..11c5008e 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -123,6 +123,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 	-e "s|@FONTDIR@|$(fontdir)|g" \
 	-e "s|@FONTPATH@|$(fontpath)|g" \
 	-e "s|@MACRODIR@|$(tmacdir)|g" \
+	-e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \
 	-e "s|@MACROPATH@|$(tmacpath)|g" \
 	-e "s|@DEVICE@|$(DEVICE)|g" \
 	-e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
diff --git a/Makefile.in b/Makefile.in
index bf1ffd3b..a296e338 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,8 +100,11 @@ fontpath=.:$(fontdir):/usr/lib/font
 # tmacdir says where to install macros.
 tmacdir=$(datasubdir)/tmac
 
+# localtmacdir says where local files will be installed
+localtmacdir=$(dataprogramdir)/site-tmac
+
 # tmacpath says where to look for macro files.
-tmacpath=.:$(tmacdir)
+tmacpath=.:$(localtmacdir):$(tmacdir)
 
 # sys_tmac_prefix is prefix (if any) for system macro packages
 sys_tmac_prefix=@sys_tmac_prefix@
@@ -266,6 +269,7 @@ MDEFINES= \
   "fontdir=$(fontdir)" \
   "fontpath=$(fontpath)" \
   "tmacdir=$(tmacdir)" \
+  "localtmacdir=$(localtmacdir)" \
   "tmacpath=$(tmacpath)" \
   "indexext=$(indexext)" \
   "indexdir=$(indexdir)" \
@@ -523,7 +527,7 @@ uninstall: uninstall_sub uninstall_dirs
 uninstall_dirs:
 # Use rmdir here so that the directories are only removed if they're empty
 	-rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
-	  $(tmacdir) $(fontdir) $(bindir) \
+	  $(tmacdir) $(localtmacdir) $(fontdir) $(bindir) \
 	  $(datasubdir) $(dataprogramdir) $(datadir)
 
 
diff --git a/NEWS b/NEWS
index 63126229..860b6b0a 100644
--- a/NEWS
+++ b/NEWS
@@ -62,7 +62,9 @@ For security reasons the following changes have been done:
     command line flag must be used.
 
 groff will now install its data files into /usr/local/share/groff/<version>
-by default, following the GNU standard.
+by default, following the GNU standard.  Additionally, a local tmac
+directory (by default /usr/local/share/groff/site-tmac) will be scanned
+before the standard tmac directory.
 
 VERSION 1.16.1
 ==============
diff --git a/man/roff.man b/man/roff.man
index cc14b046..b2b2bbfb 100644
--- a/man/roff.man
+++ b/man/roff.man
@@ -405,28 +405,35 @@ installs all of its data files in subdirectories of
 .I @FONTDIR@
 and in
 .IR @MACRODIR@ .
-This location might vary for different systems.
-In the following, this directory is referred to as
-.IR <groff_dir> .
+These locations might vary for different systems.
+In the following, the former is referred to as
+.IR <groff_font_dir> ,
+the latter as
+.IR <groff_macro_dir> .
 .LP
 .TP
-.IB <groff_dir> /tmac/troffrc
+.IB <groff_macro_dir> /troffrc
 Initialization file for troff.
 .TP
-.IB <groff_dir> /tmac/tmac. name
+.IB <groff_macro_dir> /tmac. name
 .TQ
-.IB <groff_dir> /tmac/ name .tmac
+.IB <groff_macro_dir> / name .tmac
 Macro files.
 .TP
-.IB <groff_dir> /font/dev name /DESC
+.IB <groff_font_dir> /dev name /DESC
 Device description file for device
 .IR name .
 .TP
-.IB <groff_dir> /font/dev name / F
+.IB <groff_font_dir> /dev name / F
 Font file for font
 .I F
 of device
 .IR name .
+.LP
+Finally, a local macro directory
+.I @LOCALMACRODIR@
+is provided for site-specific macros and packages; by default, it will be
+searched before the main macro directory.
 .\" --------------------------------------------------------------------
 .SH BUGS
 .\" --------------------------------------------------------------------
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index e0bd1bb4..ef25e127 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -147,7 +147,7 @@ Read in the file
 If it isn't found, try
 .IB name .tmac
 instead.
-Normally this will be searched for in @MACRODIR@.
+Normally this will be searched for in @LOCALMACRODIR@ or @MACRODIR@.
 .TP
 .B \-U
 Unsafe mode.
@@ -228,6 +228,8 @@ file and font files before the normal
 Search directory
 .I dir
 for macro files before the normal
+.B @LOCALMACRODIR@
+and
 .BR @MACRODIR@ .
 .SH USAGE
 Only the features not in Unix troff are described here.
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 0a67ef12..03ad5846 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -32,6 +32,7 @@ all: stamp-strip stamp-wrap stamp-sed
 install_data: $(NORMALFILES) $(SPECIALFILES) \
               stamp-wrap stamp-strip stamp-sed man.local
 	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
+	-test -d $(localtmacdir) || $(mkinstalldirs) $(localtmacdir)
 	if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
 	    $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \
@@ -58,8 +59,8 @@ install_data: $(NORMALFILES) $(SPECIALFILES) \
 	  rm -f $(mdocdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
 	done
-	-test -f $(tmacdir)/man.local || \
-	  $(INSTALL_DATA) $(srcdir)/man.local $(tmacdir)/man.local
+	-test -f $(localtmacdir)/man.local || \
+	  $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
 	-rm -f temp
 
 stamp-strip: $(STRIPFILES) $(MDOCFILES)
@@ -101,8 +102,8 @@ uninstall_sub:
 	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
 	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
 	-rm -f $(tmacdir)/tmac.man $(tmacdir)/tmac.ms
-	-if cmp -s $(tmacdir)/man.local $(srcdir)/man.local; then \
-	  rm -f $(tmacdir)/man.local; \
+	-if cmp -s $(localtmacdir)/man.local $(srcdir)/man.local; then \
+	  rm -f $(localtmacdir)/man.local; \
 	fi
 	-for f in $(MDOCFILES); do rm -f $(mdocdir)/$$f; done
 	-rmdir $(mdocdir)
diff --git a/tmac/groff_tmac.man b/tmac/groff_tmac.man
index af0df1d9..70a3b3ae 100755
--- a/tmac/groff_tmac.man
+++ b/tmac/groff_tmac.man
@@ -363,6 +363,11 @@ tmac directory location for groff is
 , a local installation will use
 .IB /usr/local/share/groff/ <version> /tmac\c
 \&.
+An additional directory for site-specific files which will be searched by
+default (before the standard tmac directory) is
+.I /usr/share/groff/site-tmac
+(resp.\&
+.IR /usr/local/share/groff/site-tmac ).
 Older systems used a subdirectory of
 .IR /usr/lib .
 Independently of the default tmac path, the tmac path actually used by a