From 998cad027ffaa0ef79c3d22015c80f3c768a6be1 Mon Sep 17 00:00:00 2001
From: bwarken <bwarken>
Date: Tue, 30 Apr 2013 00:40:33 +0000
Subject: 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.
---
 m4/groff.m4 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'm4')

diff --git a/m4/groff.m4 b/m4/groff.m4
index d93fe51e..9b4ce266 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1252,18 +1252,23 @@ AC_DEFUN([GROFF_GROFFERDIR_OPTION],
 
 AC_DEFUN([GROFF_GROFFERDIR_DEFAULT],
   [if test "x$with_grofferdir" = "x"; then
-    groffer_dir=$libdir/groff/groffer
+    groffer_dir=$libprogramdir/groffer
   else
     groffer_dir=$with_grofferdir
   fi
   AC_SUBST([groffer_dir])])
 
 
+AC_DEFUN([GROFF_LIBPROGRAMDIR_DEFAULT],
+  libprogramdir=$libdir/groff
+  AC_SUBST([libprogramdir]))
+
+
 AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT],
-  glilypond_dir=$libdir/groff/glilypond
+  glilypond_dir=$libprogramdir/glilypond
   AC_SUBST([glilypond_dir]))
 
 
 AC_DEFUN([GROFF_GROGDIR_DEFAULT],
-  grog_dir=$libdir/groff/grog
+  grog_dir=$libprogramdir/grog
   AC_SUBST([grog_dir]))
-- 
cgit v1.2.1