added makefile-defnied bit directories

SCCS-vsn: local/ditroff/ditroff.old.okeeffe/driver/makeifont.c 1.7
SCCS-vsn: local/ditroff/ditroff.old.okeeffe/driver/makevfont.c 1.5

diff --git a/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makeifont.c b/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makeifont.c
index f5e9a43..13fd242 100644 (file)
--- a/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makeifont.c
+++ b/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makeifont.c
@@ -1,4 +1,4 @@
-/*     makeifont.c     (Berkeley)      1.6     85/02/04
+/*     makeifont.c     (Berkeley)      1.7     85/02/26

  *
  * Font description file producer for imagen fonts:  David Slattengren
  * Taken from vfontinfo by Andy Hertzfeld  4/79
  *
  * Font description file producer for imagen fonts:  David Slattengren
  * Taken from vfontinfo by Andy Hertzfeld  4/79


@@ -57,11 +57,13 @@
 #include <ctype.h>
 #include "rst.h"
 
 #include <ctype.h>
 #include "rst.h"
 

-char   sccsid[] = "@(#)makeifont.c     1.6     (Berkeley)      %G%";
+char   sccsid[] = "@(#)makeifont.c     1.7     (Berkeley)      %G%";

 
 #define PCNTUP         62      /* percent of maximum height for an ascender */
 #define PCNTDOWN       73      /* percent of maximum droop for a descender */
 
 #define PCNTUP         62      /* percent of maximum height for an ascender */
 #define PCNTDOWN       73      /* percent of maximum droop for a descender */

+#ifndef BITDIR

 #define BITDIR         "/usr/src/local/imagen/fonts/raster"
 #define BITDIR         "/usr/src/local/imagen/fonts/raster"

+#endif

 #define POINTSIZE      40      /* this is the "unitwidth" point size */
 #define MINSIZE                6       /* the minimum and maximum point size values */
 #define MAXSIZE                36      /*    acceptible for use as "unitwidth"s */
 #define POINTSIZE      40      /* this is the "unitwidth" point size */
 #define MINSIZE                6       /* the minimum and maximum point size values */
 #define MAXSIZE                36      /*    acceptible for use as "unitwidth"s */

diff --git a/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makevfont.c b/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makevfont.c
index e908a8a..6ea4c26 100644 (file)
--- a/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makevfont.c
+++ b/usr/src/local/ditroff/ditroff.old.okeeffe/driver/makevfont.c
@@ -1,4 +1,4 @@
-/*     makevfont.c     (Berkeley)      85/02/04        1.4
+/*     makevfont.c     (Berkeley)      85/02/26        1.5

  *
  * Font description file producer for versatec fonts:  David Slattengren
  * Taken from vfontinfo by Andy Hertzfeld  4/79
  *
  * Font description file producer for versatec fonts:  David Slattengren
  * Taken from vfontinfo by Andy Hertzfeld  4/79


@@ -56,12 +56,14 @@
 #include <ctype.h>
 #include <vfont.h>
 
 #include <ctype.h>
 #include <vfont.h>
 

-char   sccsid[] = "@(#)makevfont.c     1.4     (Berkeley)      %G%";
+char   sccsid[] = "@(#)makevfont.c     1.5     (Berkeley)      %G%";

 
 #define MAGICN         0436    /* font file magic number */
 #define PCNTUP         62      /* percent of maximum height for an ascender */
 #define PCNTDOWN       73      /* percent of maximum droop for a descender */
 
 #define MAGICN         0436    /* font file magic number */
 #define PCNTUP         62      /* percent of maximum height for an ascender */
 #define PCNTDOWN       73      /* percent of maximum droop for a descender */

+#ifndef BITDIR

 #define BITDIR         "/usr/lib/vfont"
 #define BITDIR         "/usr/lib/vfont"

+#endif

 #define POINTSIZE      36      /* this is the "unitwidth" point size */
 #define MINSIZE                6       /* the minimum and maximum point size values */
 #define MAXSIZE                36      /*    acceptible for use as "unitwidth"s */
 #define POINTSIZE      36      /* this is the "unitwidth" point size */
 #define MINSIZE                6       /* the minimum and maximum point size values */
 #define MAXSIZE                36      /*    acceptible for use as "unitwidth"s */