2009-11-20 Felix Zielcke <fzielcke@z-51.de>

	* configure.ac (UNIFONT_BDF): Rename to ...
	(FONT_SOURCE): ... this.  Update all users.

diff --git a/ChangeLog b/ChangeLog
index acd740fd1dd2c3a60e22e573e3054eee5b9bfc53..61bcfc1fc2dbcb7f77fd4cce176093cc93419909 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-20  Felix Zielcke  <fzielcke@z-51.de>
+
+       * configure.ac (UNIFONT_BDF): Rename to ...
+       (FONT_SOURCE): ... this.  Update all users.
+
 2009-11-20  Felix Zielcke  <fzielcke@z-51.de>
 
        * configure.ac: Add `/usr/share/fonts/X11/misc/unifont.pcf.gz'

diff --git a/Makefile.in b/Makefile.in
index 7706cd26b226e5ffbe5b3e6c869cfffb3dc2280c..43528c534afbc79c1160f7176a5c1cb3ba55300c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,7 +108,7 @@ AWK = @AWK@
 LIBCURSES = @LIBCURSES@
 LIBUSB = @LIBUSB@
 YACC = @YACC@
-UNIFONT_BDF = @UNIFONT_BDF@
+FONT_SOURCE = @FONT_SOURCE@
 
 # Options.
 enable_grub_emu = @enable_grub_emu@
@@ -207,7 +207,7 @@ docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
        $(MKDIR_P) docs
        -$(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@
 
-ifeq (, $(UNIFONT_BDF))
+ifeq (, $(FONT_SOURCE))
 else
 
 ifeq ($(enable_grub_mkfont),yes)
@@ -218,11 +218,11 @@ pkgdata_DATA += unicode.pf2 ascii.pf2
 UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
-unicode.pf2: $(UNIFONT_BDF) grub-mkfont
-       $(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF)
+unicode.pf2: $(FONT_SOURCE) grub-mkfont
+       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
 
-ascii.pf2: $(UNIFONT_BDF) grub-mkfont
-       $(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+ascii.pf2: $(FONT_SOURCE) grub-mkfont
+       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 endif
 endif
 

diff --git a/configure.ac b/configure.ac
index a5f1d60a59f941efba9c5027374f21307617157c..383cb67a383cd2b798b2620e04f06e4929c279f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ fi
 
 for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz ; do
   if test -e $file ; then
-    AC_SUBST([UNIFONT_BDF], [$file])
+    AC_SUBST([FONT_SOURCE], [$file])
     break
   fi
 done