summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorwlemb <wlemb>2002-02-24 02:05:15 +0000
committerwlemb <wlemb>2002-02-24 02:05:15 +0000
commitf2d2922bae606f940d79f909de74f369aadd95c9 (patch)
tree07a91a82cf9d98fbc4d3e938095ce2c2b35d58b4 /Makefile.in
parent3f64de04d6f9e092a950f341e0f2d29ed15ff46a (diff)
downloadgroff-f2d2922bae606f940d79f909de74f369aadd95c9.tar.gz
* aclocal.m4 (GROFF_EBCDIC): Don't include `font/devutf8' in
TTYDEVDIRS. Define new variable OTHERDEVDIRS (containing `font/devlj4 font/devlbp' if not EBCDIC). * Makefile.in (TTYDEVDIRS): Always include `font/devutf8'. (OTHERDEVDIRS): New variable. (MDEFINES, DEVDIRS, ALLDIRS, DISTDIRS): Updated. * configure: Regenerated. * NEWS, src/devices/grotty/grotty.man: Updated. * src/roff/troff/input.cc (do_overstrike, do_bracket, get_line_arg): Honour input level. Add new symbol `mc' corresponding to U+00B5 MICRO SIGN. * font/*/*: Implement it in all font files. * font/devps/generate/textmap, font/devps/generate/symbolchars, * font/devps/symbolmap: Updated. * font/devlj4/generate/text.map: Updated. * font/devdvi/generate/CompileFonts (sizes): Add LaTeX sizes. * font/devdvi/generate/texmi.map: Updated. * font/devutf8/R.proto: Remove all `charXXX' entries. * font/devutf8/NOTES: Updated. * font/devX*/*: Regenerated with xtotroff, using fonts from XFree86 version 4.1.0. * tmac/latin1.tmac, tmac/psold.tmac, tmac/tty-char.tmac: Updated. * NEWS, man/groff_char.man: Updated.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in21
1 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index a6d4ea15..bc61f828 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,9 +57,13 @@ BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@
# DEVICE is the default device.
DEVICE=ps
-# TTYDEVDIRS is either `font/devascii font/devlatin1 font/devutf8' (for
-# ASCII) or `font/devcp1047' (for EBCDIC).
-TTYDEVDIRS=@TTYDEVDIRS@
+# TTYDEVDIRS is either `font/devascii font/devlatin1' (for
+# ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8.
+TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8
+
+# OTHERDEVDIRS is either `font/devlj4 font/devlbp' (for ASCII) or
+# empty (for EBCDIC).
+OTHERDEVDIRS=@OTHERDEVDIRS@
# PSPRINT is the command to use for printing a PostScript file,
# for example `lpr'.
@@ -291,6 +295,7 @@ MDEFINES= \
"BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
"DEVICE=$(DEVICE)" \
"TTYDEVDIRS=$(TTYDEVDIRS)" \
+ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \
"PSPRINT=$(PSPRINT)" \
"DVIPRINT=$(DVIPRINT)" \
"top_srcdir=$(top_srcdir)" \
@@ -389,9 +394,7 @@ DEVDIRS=\
font/devX75-12 \
font/devX100 \
font/devX100-12 \
- font/devlj4 \
- font/devhtml \
- font/devlbp
+ font/devhtml
ALLTTYDEVDIRS=\
font/devascii \
font/devlatin1 \
@@ -407,14 +410,14 @@ OTHERDIRS=\
contrib/pic2graph \
contrib/groffer
ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
- $(DEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+ $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
EXTRADIRS=\
font/devps/generate \
font/devdvi/generate \
src/xditview \
doc
DISTDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
- $(DEVDIRS) $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS)
+ $(DEVDIRS) $(OTHERDEVDIRS) $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS)
TARGETS=all install install_bin install_data clean distclean mostlyclean \
realclean extraclean distfiles TAGS depend uninstall_sub
@@ -487,7 +490,7 @@ $(CCPROGDIRS): FORCE
-f $(top_srcdir)/Makefile.ccpg \
-f Makefile.dep $(do)
-$(DEVDIRS) $(TTYDEVDIRS): FORCE
+$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
@$(ENVSETUP); \
if test $(srcdir) = .; \
then srcdir=.; \