[Groff-commit] groff ./ChangeLog ./Makefile.in src/devices/gro...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/01/19 16:18:45

Modified files:
        .              : ChangeLog Makefile.in 
        src/devices/grohtml: post-html.cpp 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.886&tr2=1.887&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/Makefile.in.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.886 groff/ChangeLog:1.887
--- groff/ChangeLog:1.886       Thu Jan 19 07:19:23 2006
+++ groff/ChangeLog     Thu Jan 19 16:18:45 2006
@@ -1,3 +1,19 @@
+2006-01-19  Bruno Haible  <address@hidden>
+
+       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  <address@hidden>
 
        * src/devices/grops/grops.man: Fix section on creating EPS files.
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.93 groff/Makefile.in:1.94
--- groff/Makefile.in:1.93      Wed Jan 11 00:37:42 2006
+++ groff/Makefile.in   Thu Jan 19 16:18:45 2006
@@ -530,6 +530,8 @@
   "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 @@
   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 @@
 
 
 $(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 @@
        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 @@
        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 @@
        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 @@
        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 @@
        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)
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.28 
groff/src/devices/grohtml/post-html.cpp:1.29
--- groff/src/devices/grohtml/post-html.cpp:1.28        Fri Nov 25 17:00:46 2005
+++ groff/src/devices/grohtml/post-html.cpp     Thu Jan 19 16:18:45 2006
@@ -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 (address@hidden) wrote post-html.cpp
@@ -4305,14 +4305,10 @@
     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;
   }
 }