summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-03-06 14:56:45 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-03-06 14:56:45 +0000
commitee397c31061eb572e6be7d413ba97d3ab23fc933 (patch)
tree0c94cd0288541b7195a31ea5c5e2a76ce0cf34b2
parentfd7aee3c4332cf3fe12343a016c3cac9db9e7f8e (diff)
downloadbootloader-theme-ee397c31061eb572e6be7d413ba97d3ab23fc933.tar
bootloader-theme-ee397c31061eb572e6be7d413ba97d3ab23fc933.tar.gz
bootloader-theme-ee397c31061eb572e6be7d413ba97d3ab23fc933.tar.bz2
bootloader-theme-ee397c31061eb572e6be7d413ba97d3ab23fc933.tar.xz
bootloader-theme-ee397c31061eb572e6be7d413ba97d3ab23fc933.zip
Use binary names as installed by the new gfxboot package
-rw-r--r--Makefile2
-rw-r--r--fonts/Makefile6
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