diff options
| author | Alfred M. Szmidt <ams@gnu.org> | 2004-09-29 22:17:30 +0000 |
|---|---|---|
| committer | Alfred M. Szmidt <ams@gnu.org> | 2004-09-29 22:17:30 +0000 |
| commit | 3931b146f348acc1726428f2e9aea45b4358c47b (patch) | |
| tree | f48e9c77d3efb0de1aea597883e6671133a0b97b | |
| parent | 14f5724eb847177778ff9edd72b7e873bdcdd0c2 (diff) | |
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.
| -rw-r--r-- | console-client/Makefile | 3 | ||||
| -rw-r--r-- | console-client/vga.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/console-client/Makefile b/console-client/Makefile index 836ec514..b0f33907 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -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 @@ console: ../libcons/libcons.a ../libports/libports.a \ 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) diff --git a/console-client/vga.c b/console-client/vga.c index aecdfcdc..c2d55f87 100644 --- a/console-client/vga.c +++ b/console-client/vga.c @@ -49,17 +49,17 @@ #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. */ |