From 81c53e67a335973d82801b335010ab833952b666 Mon Sep 17 00:00:00 2001 From: wlemb Date: Fri, 5 Mar 2004 09:58:59 +0000 Subject: * Makefile.in (SEP): Replaced with... (RT_SEP, SH_SEP): Separators for the target platform's native path separator and the build environment, respectively. (fontpath, tmacpath): Use RT_SEP. (MDEFINES): Updated. * contrib/mom/Makefile.sub (GROFF_BIN_PATH): Use SH_SEP. * doc/Makefile.sub (GROFF_BIN_PATH): Use SH_SEP. * src/preproc/eqn/Makefile.sub (neqn): Use SH_SEP. * src/roff/nroff/Makefile.sub (nroff): Use SH_SEP. * fonts/devlj4/Makefile.sub (LJ4RES): Set to 1200. This helps to reduce alignment problems with newer printers which use built-in TrueType fonts (instead of the older Intellifonts). The ideal solution is to provide a second set of groff metric files, but this is extremely time-consuming to produce, given that HP's metric files are very rudimentary. --- Makefile.in | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3aaaeece..78501076 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,5 @@ -# Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -23,7 +24,15 @@ srcdir=@srcdir@ top_srcdir=@abs_top_srcdir@ VPATH=@srcdir@ top_builddir=@abs_top_builddir@ -SEP=@GROFF_PATH_SEPARATOR@ + +# `RT_SEP' is the operating system's native PATH SEPARATOR CHAR, which +# is to be used in runtime PATHs compiled into groff executables. +RT_SEP=@GROFF_PATH_SEPARATOR@ + +# `SH_SEP' is a alternative PATH SEPARATOR CHAR, to be used in shell +# scripts and makefile rules; it may be the same as `RT_SEP', but, +# particularly in some Microsoft environments, it may differ. +SH_SEP=@PATH_SEPARATOR@ version=`cat $(top_srcdir)/VERSION` # No additional number if revision is zero. @@ -123,7 +132,7 @@ localfontdir=$(dataprogramdir)/site-font legacyfontdir=/usr/lib/font # `fontpath' says where to look for dev*/*. -fontpath=$(localfontdir)$(SEP)$(fontdir)$(SEP)$(legacyfontdir) +fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir) # `tmacdir' says where to install macros. tmacdir=$(datasubdir)/tmac @@ -139,7 +148,7 @@ localtmacdir=$(dataprogramdir)/site-tmac # directory will be always added. # `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the # current nor in the home directory. -tmacpath=$(systemtmacdir)$(SEP)$(localtmacdir)$(SEP)$(tmacdir) +tmacpath=$(systemtmacdir)$(RT_SEP)$(localtmacdir)$(RT_SEP)$(tmacdir) # `sys_tmac_prefix' is prefix (if any) for system macro packages. sys_tmac_prefix=@sys_tmac_prefix@ @@ -373,7 +382,8 @@ MDEFINES= \ "PURIFY=$(PURIFY)" \ "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \ "RANLIB=$(RANLIB)" \ - "SEP=$(SEP)" \ + "RT_SEP=$(RT_SEP)" \ + "SH_SEP=$(SH_SEP)" \ "SHELL=$(SHELL)" \ "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \ "TTYDEVDIRS=$(TTYDEVDIRS)" \ -- cgit v1.2.1