Fix $srcdir != $builddir build by moving ascii.h to top dir.

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 3842f9b512daaec3af59a821dcd9a9abfc95d256..576c85904897abda4a845df7f5e09d6bc70cb06c 100644 (file)
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -6,7 +6,7 @@
 
        * font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
        By default: disabled.
-       * Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
+       * Makefile.in (ascii.h): Remove the non-needed grub/bin2h size
        parameter.
 
 2010-01-10  Carles Pina i Estany  <carles@pina.cat>
@@ -32,7 +32,7 @@
        (write_font_p2): ... this. Remove print_glyphs call.
        (main): Use file_format. Implement code for ranges if ascii-bitmaps is
        used. Call print_glyphs.
-       * Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
+       * Makefile.in (pkgdata_DATA): Add `ascii.h'.
 
 2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
 

diff --git a/Makefile.in b/Makefile.in
index c551a0d79b3379c15c2e3daf6d3b6aa28f645746..a3084c69a583a34886a7677ebaa947e7ab38e9fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ else
 
 ifeq ($(enable_grub_mkfont),yes)
 
-pkgdata_DATA += unicode.pf2 ascii.pf2 font/ascii.h
+pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
 
 # Arrows and lines are needed to draw the menu, so we always include them
 UNICODE_ARROWS=0x2190-0x2193
@@ -246,11 +246,11 @@ unicode.pf2: $(FONT_SOURCE) grub-mkfont
 ascii.pf2: $(FONT_SOURCE) grub-mkfont
        $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 
-font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
+ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
        $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 
-font/ascii.h: font/ascii.bitmaps grub-bin2h
-       $(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h
+ascii.h: ascii.bitmaps grub-bin2h
+       $(builddir)/grub-bin2h ascii_bitmaps < $< > $@
 
 TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
 endif