Makefile.in, m4/groff.m4: Add `@libprogramdir@' and

  `$libprogramdir' (usually `/usr/local/lib/groff').  Change
  `$libdir/groff' into $libprogramdir for several `groff' programs.
  Run `autoreconf -I m4'.

src/roff/groff/MAkefile.sub: Add $(DESTDIR) and $(srcdir) in
  order to support installation outside of source code.

1 files changed, 7 insertions, 4 deletions

diff --git a/configure b/configure
index 9bf5a1b3..274ff49d 100755
--- a/configure
+++ b/configure
@@ -744,7 +744,8 @@ PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
 grog_dir
-glilypond_dir'
+glilypond_dir
+libprogramdir'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -5519,6 +5520,8 @@ EOF
      fi
    fi
 
+libprogramdir=$libdir/groff
+
 
 # Check whether --with-grofferdir was given.
 if test "${with_grofferdir+set}" = set; then :
@@ -5526,14 +5529,14 @@ if test "${with_grofferdir+set}" = set; then :
 fi
 
 if test "x$with_grofferdir" = "x"; then
-    groffer_dir=$libdir/groff/groffer
+    groffer_dir=$libprogramdir/groffer
   else
     groffer_dir=$with_grofferdir
   fi
 
-glilypond_dir=$libdir/groff/glilypond
+glilypond_dir=$libprogramdir/glilypond
 
-grog_dir=$libdir/groff/grog
+grog_dir=$libprogramdir/grog
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }