diff options
author | bwarken <bwarken> | 2013-04-30 00:40:33 +0000 |
---|---|---|
committer | bwarken <bwarken> | 2013-04-30 00:40:33 +0000 |
commit | 998cad027ffaa0ef79c3d22015c80f3c768a6be1 (patch) | |
tree | 0551605dcfa301b4f0c9e9fe431d73f6edf73c7e /m4 | |
parent | 0c1afde695837e60afff35b5a2be65259a29d7ec (diff) | |
download | groff-998cad027ffaa0ef79c3d22015c80f3c768a6be1.tar.gz |
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.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/groff.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
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])) |