Re: default font filenames

[Alfred M. Szmidt]

   Rock on.

My pleasure.

./ChangeLog
2004-09-29  Alfred M. Szmidt  <ams@kemisten.nu>

        * config.make.in (datadir): New variable.

console-client/ChangeLog
2004-09-29  Alfred M. Szmidt  <ams@kemisten.nu>

        * Makefile (vga-CPPFLAGS): New variable.

        * vga.c (DEFAULT_VGA_FONT, DEFAULT_VGA_FONT_ITALIC)
        (DEFAULT_VGA_FONT_BOLD, DEFAULT_VGA_FONT_BOLD_ITALIC): Use
        `DEFAULT_VGA_FONT_DIR' instead of hardcoding the filename.
                                   
Index: config.make.in
===================================================================
RCS file: /cvsroot/hurd/hurd/config.make.in,v
retrieving revision 1.17
diff -u -r1.17 config.make.in
--- config.make.in      27 Jan 2004 04:52:11 -0000      1.17
+++ config.make.in      29 Sep 2004 20:54:58 -0000
@@ -26,6 +26,7 @@
 sysconfdir = @sysconfdir@
 localstatedir = @localstatedir@
 sharedstatedir = @sharedstatedir@
+datadir = @datadir@
 
 # All of those directories together:
 installationdirlist = $(hurddir) $(libdir) $(bindir) $(sbindir) \
Index: console-client/Makefile
===================================================================
RCS file: /cvsroot/hurd/hurd/console-client/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- console-client/Makefile     17 Sep 2002 12:26:10 -0000      1.1
+++ console-client/Makefile     29 Sep 2004 20:55:31 -0000
@@ -1,5 +1,5 @@
 #
-#   Copyright (C) 1994,95,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
+#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,04 Free Software Foundation, 
Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -43,6 +43,7 @@
 
 modules = vga pc_kbd generic_speaker
 
+vga-CPPFLAGS = -DDEFAULT_VGA_FONT_DIR=\"${datadir}/hurd\"
 vga.so.$(hurd-version): $(patsubst %.c,%_pic.o,bdf.c vga-dynafont.c \
        vga-dynacolor.c vga-support.c vga.c)
 pc_kbd.so.$(hurd-version): $(patsubst %.c,%_pic.o,pc-kbd.c)
Index: console-client/vga.c
===================================================================
RCS file: /cvsroot/hurd/hurd/console-client/vga.c,v
retrieving revision 1.5
diff -u -r1.5 vga.c
--- console-client/vga.c        21 Mar 2004 19:57:00 -0000      1.5
+++ console-client/vga.c        29 Sep 2004 20:55:40 -0000
@@ -49,17 +49,20 @@
 #define VGA_DISP_HEIGHT 25
 
 /* The font file.  */
-#define DEFAULT_VGA_FONT "/lib/hurd/fonts/vga-system.bdf"
+#define DEFAULT_VGA_FONT \
+        DEFAULT_VGA_FONT_DIR "vga-system.bdf"
 static char *vga_display_font;
 
-#define DEFAULT_VGA_FONT_ITALIC "/lib/hurd/fonts/vga-system-italic.bdf"
+#define DEFAULT_VGA_FONT_ITALIC \
+        DEFAULT_VGA_FONT_DIR "vga-system-italic.bdf"
 static char *vga_display_font_italic;
 
-#define DEFAULT_VGA_FONT_BOLD "/lib/hurd/fonts/vga-system-bold.bdf"
+#define DEFAULT_VGA_FONT_BOLD \
+        DEFAULT_VGA_FONT_DIR "vga-system-bold.bdf"
 static char *vga_display_font_bold;
 
 #define DEFAULT_VGA_FONT_BOLD_ITALIC \
-       "/lib/hurd/fonts/vga-system-bold-italic.bdf"
+       DEFAULT_VGA_FONT_DIR "vga-system-bold-italic.bdf"
 static char *vga_display_font_bold_italic;
 
 /* If false use all colors, else use double font slots.  */