[groff] 02/02: test-groff.in: Recognize additional contrib tmacs.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit ff85acc64647e562d59eeaad34f5672b6c684913
Author: G. Branden Robinson <address@hidden>
Date:   Thu Nov 2 07:16:23 2017 -0400

    test-groff.in: Recognize additional contrib tmacs.
    
    "tmac" files in the directories "contrib/hdtbl", "contrib/mm", and
    "contrib/pdfmark" are not included in the search path for "test-groff".
    That is of cause necessary to test those macro files and files using
    those.
    
    Fixes Savannah #51598.
    
    Signed-off-by: Bjarni Ingi Gislason <address@hidden>
    
    Break these hard-to-read declarations across lines so they're easier to
    maintain.
    
    Kill useless trailing whitespace.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 test-groff.in | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/test-groff.in b/test-groff.in
index 4bdba06..7407372 100644
--- a/test-groff.in
+++ b/test-groff.in
@@ -1,19 +1,19 @@
 #! /bin/sh
 #
 # Copyright (C) 1989-2014 Free Software Foundation, Inc.
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -29,8 +29,22 @@ XENVIRONMENT=$srcdir/src/devices/xditview/GXditview.ad
 export XENVIRONMENT
 
 GROFF_COMMAND_PREFIX=
-GROFF_FONT_PATH=$builddir/font$SEP$srcdir/font
-GROFF_TMAC_PATH=$srcdir/tmac$SEP$builddir/tmac$SEP$srcdir/contrib/mom$SEP$builddir/contrib/mom
+GROFF_FONT_PATH=$builddir/font\
+$SEP$srcdir/font\
+
+GROFF_TMAC_PATH=$srcdir/tmac\
+$SEP$builddir/tmac\
+$SEP$srcdir/contrib/mom\
+$SEP$builddir/contrib/mom\
+$SEP$srcdir/contrib/hdtbl\
+$SEP$builddir/contrib/hdtbl\
+$SEP$srcdir/contrib/mm\
+$SEP$builddir/contrib/mm\
+$SEP$srcdir/contrib/mm/locale\
+$SEP$builddir/contrib/mm/locale\
+$SEP$srcdir/contrib/pdfmark\
+$SEP$builddir/contrib/pdfmark\
+
 export GROFF_BIN_PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH
 
 exec $builddir/groff ${1+"$@"}