diff options
author | wl <wl> | 2006-01-19 16:18:45 +0000 |
---|---|---|
committer | wl <wl> | 2006-01-19 16:18:45 +0000 |
commit | 9557003d564892c7a12b4ede8b452636569c0dbb (patch) | |
tree | d17c0ef12ff54524f43d5ce6e6802f1dd47fe520 | |
parent | 4aa515cc0858ad8357f7f77c3eae7a01ded7b82f (diff) | |
download | groff-9557003d564892c7a12b4ede8b452636569c0dbb.tar.gz |
Let `make -k install' install more files.
* Makefile.in (MAKE_K_FLAG): New variable. Use it everywhere where
$(MAKE) and $(MDEFINES) are used.
(CPROGDIRS): Remove $(XPROGDIRS). Treat $(XPROGDIRS) like
$(CPROGDIRS) everywhere.
($(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS)): Don't depend
on $(XPROGDIRS).
($(OTHERDIRS)): Likewise.
* src/devices/grohtml/post-html.cpp (get_html_translation): Remove
failure test for font::name_to_index -- it can never fail.
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | Makefile.in | 27 | ||||
-rw-r--r-- | src/devices/grohtml/post-html.cpp | 12 |
3 files changed, 34 insertions, 21 deletions
@@ -1,3 +1,19 @@ +2006-01-19 Bruno Haible <bruno@clisp.org> + + Let `make -k install' install more files. + + * Makefile.in (MAKE_K_FLAG): New variable. Use it everywhere where + $(MAKE) and $(MDEFINES) are used. + (CPROGDIRS): Remove $(XPROGDIRS). Treat $(XPROGDIRS) like + $(CPROGDIRS) everywhere. + ($(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS)): Don't depend + on $(XPROGDIRS). + ($(OTHERDIRS)): Likewise. + + + * src/devices/grohtml/post-html.cpp (get_html_translation): Remove + failure test for font::name_to_index -- it can never fail. + 2006-01-19 Werner LEMBERG <wl@gnu.org> * src/devices/grops/grops.man: Fix section on creating EPS files. diff --git a/Makefile.in b/Makefile.in index 55975f0a..8169b08f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -530,6 +530,8 @@ MDEFINES= \ "top_srcdir=$(top_srcdir)" \ "version=$(version)" +MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac` + INCDIRS=src/include LIBDIRS=\ src/libs/libgroff \ @@ -560,10 +562,9 @@ CCPROGDIRS=\ src/utils/lkbib \ src/utils/addftinfo CPROGDIRS=\ - src/utils/pfbtops \ - $(XPROGDIRS) + src/utils/pfbtops PROGDEPDIRS=arch/misc -PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) +PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(XPROGDIRS) DEVDIRS=\ font/devps \ font/devdvi \ @@ -626,11 +627,11 @@ subdir=src/roff/troff $(TARGETS): - @$(ENVSETUP); $(MAKE) $(MDEFINES) do=$@ $(dodirs) + @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs) dot: FORCE @$(ENVSETUP); \ - $(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ -f $(top_srcdir)/Makefile.comm \ -f $(top_srcdir)/Makefile.sub $(do) @@ -644,13 +645,13 @@ $(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ test -f Makefile.dep || touch Makefile.dep; \ - $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ -f $(top_srcdir)/Makefile.comm \ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.lib \ -f Makefile.dep $(do) -$(CPROGDIRS): FORCE $(LIBDIRS) +$(CPROGDIRS) $(XPROGDIRS): FORCE $(LIBDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -660,7 +661,7 @@ $(CPROGDIRS): FORCE $(LIBDIRS) test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ test -f Makefile.dep || touch Makefile.dep; \ - $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ -f $(top_srcdir)/Makefile.comm \ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.cpg \ @@ -676,13 +677,13 @@ $(CCPROGDIRS): FORCE $(LIBDIRS) test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ test -f Makefile.dep || touch Makefile.dep; \ - $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ -f $(top_srcdir)/Makefile.comm \ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.ccpg \ -f Makefile.dep $(do) -$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS) +$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -691,12 +692,12 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS) fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ - $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ -f $(top_srcdir)/Makefile.comm \ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.dev $(do) -$(OTHERDIRS): $(PROGDIRS) +$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE @$(ENVSETUP); \ @@ -707,7 +708,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ - $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ + $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ -f $(top_srcdir)/Makefile.comm \ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.man $(do) diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp index ce838da1..ad33b03e 100644 --- a/src/devices/grohtml/post-html.cpp +++ b/src/devices/grohtml/post-html.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 * Free Software Foundation, Inc. * * Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cpp @@ -4305,14 +4305,10 @@ char *get_html_translation (font *f, const string &name) return NULL; else { idx = f->name_to_index((char *)(name + '\0').contents()); - if (idx == 0) { - error("character `%s' not found", (name + '\0').contents()); + if (f->contains(idx)) + return (char *)f->get_special_device_encoding(idx); + else return NULL; - } else - if (f->contains(idx)) - return (char *)f->get_special_device_encoding(idx); - else - return NULL; } } |