* examples/fontdumps_n.roff, examples/fontdumps_x.roff: Renamed

to...
* example/fontdumps_n.in, example/fontdumps_x_in: This.
Rename `*fontpath' to `fontpath' and define it conditionally (using
`@fontdir@') so that it can be overridden on the command line.

* Makefile.sub (GENFILES, GENFILES_): New variables for
fontdumps*.roff.
(EXAMPLEFILES): Remove fontdumps.roff.
(CLEANADD): Add GENFILES.
(.in.roff): New rule.
(.SUFFIXES): Add `.in'.
(install_data, uninstall_sub): Updated.

4 files changed, 46 insertions, 18 deletions

diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 14791a62..13239d28 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,19 @@
+2006-06-21  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/fontdumps_n.roff, examples/fontdumps_x.roff: Renamed
+	to...
+	* example/fontdumps_n.in, example/fontdumps_x_in: This.
+	Rename `*fontpath' to `fontpath' and define it conditionally (using
+	`@fontdir@') so that it can be overridden on the command line.
+	
+	* Makefile.sub (GENFILES, GENFILES_): New variables for
+	fontdumps*.roff.
+	(EXAMPLEFILES): Remove fontdumps.roff.
+	(CLEANADD): Add GENFILES.
+	(.in.roff): New rule.
+	(.SUFFIXES): Add `.in'.
+	(install_data, uninstall_sub): Updated.
+
 2006-06-14  Werner LEMBERG  <wl@gnu.org>
 
 	* hdmisc.tmac: Fix test for \n[?] to avoid warning message.
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index 61183b1e..d470abdb 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -47,6 +47,11 @@ STRIPFILES=\
   hdtbl.tmac \
   hdmisc.tmac
 
+# These files are handled by the `.in.roff' rule.
+GENFILES=\
+  examples/fontdumps_n.roff \
+  examples/fontdumps_x.roff
+
 EXAMPLEFILES=\
   examples/chess_board.roff \
   examples/colored_boxes.roff \
@@ -54,8 +59,6 @@ EXAMPLEFILES=\
   examples/colored_table_cells.roff \
   examples/color_transitions.roff \
   examples/col_rowspan_colors.roff \
-  examples/fontdumps_n.roff \
-  examples/fontdumps_x.roff \
   examples/mixed_pickles.roff \
   examples/rainbow.roff \
   examples/short_reference.roff
@@ -74,17 +77,23 @@ PROCESSEDEXAMPLEFILES=\
   examples/short_reference.ps
 
 EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'`
+GENFILES_=`echo $(GENFILES) | sed 's|examples/||g'`
 PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'`
 
 CLEANADD=\
   gnu.eps \
   $(PROCESSEDEXAMPLEFILES) \
+  $(GENFILES) \
   examples/stamp \
   stamp-strip
 
-.SUFFIXES: .roff .ps
+.SUFFIXES: .roff .in .ps
+
 .roff.ps:
-	$(GROFF) -Tps -mhdtbl $< >$@
+	$(GROFF) -Tps -dfontpath=$(top_srcdir)/font -mhdtbl $< >$@
+
+.in.roff:
+	sed -e "s|@fontdir@|$(fontdir)|" $< >$@
 
 
 all: $(PROCESSEDEXAMPLEFILES) stamp-strip
@@ -112,8 +121,8 @@ stamp-strip: $(STRIPFILES)
 	done
 	touch $@
 
-install_data: $(STRIPFILES) $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
-              stamp-strip
+install_data: $(STRIPFILES) $(EXAMPLEFILES) $(GENFILES) \
+              $(PROCESSEDEXAMPLEFILES) stamp-strip
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(STRIPFILES); do \
 	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
@@ -126,7 +135,7 @@ install_data: $(STRIPFILES) $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
 	  $(INSTALL_DATA) $(srcdir)/examples/$$f \
 	    $(DESTDIR)$(exampledir)/hdtbl/$$f; \
 	done
-	for f in $(PROCESSEDEXAMPLEFILES_); do \
+	for f in $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
 	  rm -f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
 	  $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
 	done
@@ -136,7 +145,8 @@ uninstall_sub:
 	-for f in $(STRIPFILES); do \
 	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_); do \
+	-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) \
+                  $(GENFILES_); do \
 	  rm -f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
 	done
 	-rmdir $(DESTDIR)$(exampledir)/hdtbl
diff --git a/contrib/hdtbl/examples/fontdumps_n.roff b/contrib/hdtbl/examples/fontdumps_n.in
index 4d52f437..b7ed3277 100644
--- a/contrib/hdtbl/examples/fontdumps_n.roff
+++ b/contrib/hdtbl/examples/fontdumps_n.in
@@ -28,17 +28,18 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .\"	******************************************************************
 .\"	**		groff glyphs vs. character codes:		**
-.\"	**	.fontdump [font1 font2 ... ]				**
+.\"	**	.fontdump [font1 font2 ...]				**
 .\"	**		Print glyphs of font1, font2, ..., versus	**
 .\"	**		character code.					**
 .\"	**		`all' as fontname prints all fonts in the	**
-.\"	**		specified fontpath `*fontpath'.			**
+.\"	**		specified string `fontpath'.			**
 .\"	**		without arg: glyphs and codes of active font.	**
 .\"	******************************************************************
 .
 .time start
 .
-.ds *fontpath /usr/local/share/groff/1.19.3/font
+.if !d fontpath \
+.  ds fontpath @fontdir@
 .
 .de fontdump
 .  ie \\n[.$] \
@@ -48,7 +49,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .  pso bash -c \
        "echo -n .ds *f\ ; \
-        ls --color=never \\*[*fontpath]/dev\*[.T] \
+        ls --color=never \\*[fontpath]/dev\*[.T] \
         | tr '[:cntrl:]' ' '"
 .  \"	This dummy line is necessary; the preceding line eats it.
 .
@@ -98,7 +99,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .    TBL border=.1n bc=red cpd=0 csp=.1n bgc=
 .      CPTN groff font \\*[*$1] \
             .br \
-            val=b ".pso grep -e internalname \\*[*fontpath]/dev\*[.T]/\\*[*$1]"
+            val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
 .      TR 
 .        TD
 .          TBL cols=12 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \
diff --git a/contrib/hdtbl/examples/fontdumps_x.roff b/contrib/hdtbl/examples/fontdumps_x.in
index 19005964..8106684d 100644
--- a/contrib/hdtbl/examples/fontdumps_x.roff
+++ b/contrib/hdtbl/examples/fontdumps_x.in
@@ -28,17 +28,18 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .\"	******************************************************************
 .\"	**		groff glyphs vs. character codes:		**
-.\"	**	.fontdump [font1 font2 ... ]				**
+.\"	**	.fontdump [font1 font2 ...]				**
 .\"	**		Print glyphs of font1, font2, ..., versus	**
 .\"	**		character code.					**
 .\"	**		`all' as fontname prints all fonts in the	**
-.\"	**		specified fontpath `*fontpath'.			**
+.\"	**		specified string `fontpath'.			**
 .\"	**		without arg: glyphs and codes of active font.	**
 .\"	******************************************************************
 .
 .time start
 .
-.ds *fontpath /usr/local/share/groff/1.19.3/font
+.if !d fontpath \
+.  ds fontpath @fontdir@
 .
 .de fontdump
 .  ie \\n[.$] \
@@ -48,7 +49,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .  pso bash -c \
        "echo -n .ds *f\ ; \
-        ls --color=never \\*[*fontpath]/dev\*[.T] \
+        ls --color=never \\*[fontpath]/dev\*[.T] \
         | tr '[:cntrl:]' ' '"
 .  \"	This dummy line is necessary; the preceding line eats it.
 .
@@ -98,7 +99,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .    TBL border=.1n bc=red cpd=0 csp=.1n bgc=
 .      CPTN groff font \\*[*$1] \
             .br \
-            val=b ".pso grep -e internalname \\*[*fontpath]/dev\*[.T]/\\*[*$1]"
+            val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
 .      TR
 .        TD
 .          TBL cols=18 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \