From ee397c31061eb572e6be7d413ba97d3ab23fc933 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 6 Mar 2009 14:56:45 +0000 Subject: Use binary names as installed by the new gfxboot package --- Makefile | 2 +- fonts/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5d2f270..e2b1f98 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ else PREPARED = $(shell [ -f .prepared ] && echo 1) endif -ADDDIR = ../../bin/adddir +ADDDIR = gfxboot-adddir BFLAGS = -O -v -L ../.. SUBDIRS = fonts help-boot help-install po src diff --git a/fonts/Makefile b/fonts/Makefile index ce60b70..e02c173 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -1,7 +1,5 @@ -BINDIR := $(shell [ -x ../../../gfxboot-font ] && echo ../../../ ) - -GFXBOOT_FONT = $(BINDIR)gfxboot-font -KEYMAPCHARS = $(BINDIR)bin/keymapchars +GFXBOOT_FONT = gfxboot-font +KEYMAPCHARS = gfxboot-keymapchars all: .ready -- cgit v1.2.1