Here's a little patch for Makefile.in to use the new grub-mkfont to create the font files. Is it okay or is there a better way to do this?
-- Felix Zielcke
2009-01-16 Felix Zielcke <fziel...@z-51.de> Makefile.in: Use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible. Index: Makefile.in =================================================================== --- Makefile.in (revision 1946) +++ Makefile.in (working copy) @@ -159,8 +159,13 @@ pkgdata_DATA += unicode.pf2 ascii.pf2 UNICODE_ARROWS=0x2190-0x2193 UNICODE_LINES=0x2501-0x251B -# Note: fonttool should be replaced with C only implementation - +ifeq ($(enable_grub_mkfont),yes) +unicode.pf2: $(UNIFONT_BDF) grub-mkfont + $(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF) + +ascii.pf2: $(UNIFONT_BDF) grub-mkfont + $(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES) +else $(builddir)/fonttool/fonttool.jar: mkdir -p "$(builddir)/fonttool/src" javac -source 1.5 -target 1.5 -g -deprecation -encoding UTF-8 -d "$(builddir)/fonttool/src" `find "$(srcdir)/util/fonttool/src/" -name '*.java'` @@ -172,6 +177,7 @@ unicode.pf2: $(UNIFONT_BDF) $(builddir)/ ascii.pf2: $(UNIFONT_BDF) $(builddir)/fonttool/fonttool.jar java -cp $(builddir)/fonttool/fonttool.jar org.gnu.grub.fonttool.Converter --in=$(UNIFONT_BDF) --out=$@ 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES) endif +endif # Used for building modules externally pkglib_BUILDDIR += build_env.mk
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
