diff options
-rw-r--r-- | ChangeLog | 22 | ||||
-rw-r--r-- | Makefile.in | 20 | ||||
-rw-r--r-- | contrib/mom/Makefile.sub | 4 | ||||
-rw-r--r-- | doc/Makefile.sub | 4 | ||||
-rw-r--r-- | font/devlj4/Makefile.sub | 2 | ||||
-rw-r--r-- | src/preproc/eqn/Makefile.sub | 2 | ||||
-rw-r--r-- | src/roff/nroff/Makefile.sub | 2 |
7 files changed, 44 insertions, 12 deletions
@@ -1,3 +1,25 @@ +2004-03-05 Keith Marshall <keith.d.marshall@ntlworld.com> + + * 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. + +2004-03-05 Werner LEMBERG <wl@gnu.org> + + * 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. + 2004-03-01 Werner LEMBERG <wl@gnu.org> * src/devices/grolj4/lj4.cpp (main): Fix argument of getopt_long. 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)" \ diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub index c8653930..008c9d98 100644 --- a/contrib/mom/Makefile.sub +++ b/contrib/mom/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. # Written by Werner Lemberg (wl@gnu.org) # # This file is part of groff. @@ -19,7 +19,7 @@ # These may be overridden if cross-compiling. GROFFBIN=$(top_builddir)/src/roff/groff/groff -GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SEP)|g'` +GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'` groff_bin_dirs=\ $(top_builddir)/src/roff/groff \ diff --git a/doc/Makefile.sub b/doc/Makefile.sub index b57fc8e0..879b0914 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. # Written by Werner Lemberg <wl@gnu.org> # # This file is part of groff. @@ -19,7 +19,7 @@ # These may be overridden if cross-compiling. GROFFBIN=$(top_builddir)/src/roff/groff/groff -GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SEP)|g'` +GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'` # Since info files are distributed within the groff package, no # autoconf test for the makeinfo binary is done. diff --git a/font/devlj4/Makefile.sub b/font/devlj4/Makefile.sub index f764135d..0ad3f4da 100644 --- a/font/devlj4/Makefile.sub +++ b/font/devlj4/Makefile.sub @@ -1,5 +1,5 @@ DEV=lj4 -LJ4RES=600 +LJ4RES=1200 LJ4PRINT=$(PSPRINT) DEVFILES=DESC \ AB ABI AI AR \ diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub index 75546456..7312343a 100644 --- a/src/preproc/eqn/Makefile.sub +++ b/src/preproc/eqn/Makefile.sub @@ -48,7 +48,7 @@ neqn: neqn.sh -rm -f $@ sed -e 's/@g@/$(g)/g' \ -e 's|@BINDIR@|$(bindir)|g' \ - -e 's|@SEP@|$(SEP)|g' \ + -e 's|@SEP@|$(SH_SEP)|g' \ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@ chmod +x $@ diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub index 138c870a..abd6d4a5 100644 --- a/src/roff/nroff/Makefile.sub +++ b/src/roff/nroff/Makefile.sub @@ -7,7 +7,7 @@ all: nroff nroff: nroff.sh rm -f $@ sed -e "s|@BINDIR@|$(bindir)|g" \ - -e "s|@SEP@|$(SEP)|g" \ + -e "s|@SEP@|$(SH_SEP)|g" \ -e $(SH_SCRIPT_SED_CMD) \ -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@ chmod +x $@ |