From c96557721be60d942f4d486b9ea7f9b7cbb034cc Mon Sep 17 00:00:00 2001 From: ru Date: Thu, 1 May 2003 13:09:50 +0000 Subject: Virgin import of FSF groff v1.19 --- contrib/groff/doc/Makefile.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'contrib/groff/doc/Makefile.in') diff --git a/contrib/groff/doc/Makefile.in b/contrib/groff/doc/Makefile.in index 97f75f9..313889d 100644 --- a/contrib/groff/doc/Makefile.in +++ b/contrib/groff/doc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. # Written by Werner Lemberg # # This file is part of groff. @@ -32,7 +32,12 @@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ VPATH=@srcdir@ top_builddir=@groff_top_builddir@ +pnmtops=@pnmtops_nosetpage@ +# These may be overridden if cross-compiling. +TROFFBIN=$(top_builddir)/src/roff/troff/troff +GROFFBIN=$(top_builddir)/src/roff/groff/groff +GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'` # Since info files are distributed within the groff package, no # autoconf test for the makeinfo binary is done. @@ -58,7 +63,6 @@ groff_bin_dirs=\ $(top_builddir)/src/devices/grolj4 \ $(top_builddir)/src/devices/grolbp \ $(top_builddir)/src/devices/grohtml -groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'` version=`cat $(top_srcdir)/VERSION` # No additional number if revision is zero. @@ -67,13 +71,13 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -TROFF=$(top_builddir)/src/roff/troff/troff $(TFLAG) $(FFLAG) -ww +TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww GROFF=GROFF_COMMAND_PREFIX=''; \ export GROFF_COMMAND_PREFIX; \ - GROFF_BIN_PATH=$(groff_bin_path); \ + GROFF_BIN_PATH=$(GROFF_BIN_PATH); \ export GROFF_BIN_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ - | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww + | $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww imagedir=img @@ -110,7 +114,7 @@ groff: groff.texinfo $(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo gnu.eps: gnu.xpm - xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtops -noturn >$@ + xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | $(pnmtops) -noturn >$@ gnu.png: gnu.xpm xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@ -- cgit v1.1