From 7ec1fa01d0f039ab1d066b8a2fed5d15c0a85e45 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 27 Jan 2009 17:30:43 +0000
Subject: do not have files both in the tarball and in the directory

- for syslinux, some files must be in "bootlogo", while most of them can be
outside of "bootlogo"
- for grub, "message.dir" files are all in "message" file, so message.dir is
useless
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e68d12c..7c9cdcb 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ BFLAGS       = -O -v -L ../..
 
 SUBDIRS      = fonts help-boot help-install po src
 
+IN_CPIO_INSTALL = init $(notdir $(wildcard fonts/*.fnt)) $(notdir $(wildcard po/*.tr))
+
 DEFAULT_LANG =
 
 .PHONY: all clean distclean themes $(SUBDIRS)
@@ -49,7 +51,8 @@ ifdef DEFAULT_LANG
 	@echo $(DEFAULT_LANG) >bootlogo.dir/lang
 endif
 	@sh -c 'cd bootlogo.dir; chmod +t * ; chmod -t init languages'
-	@sh -c 'cd bootlogo.dir; echo * | sed -e "s/ /\n/g" | cpio --quiet -o >../bootlogo'
+	@sh -c 'cd bootlogo.dir; echo $(IN_CPIO_INSTALL) | sed -e "s/ /\n/g" | cpio --quiet -o >../bootlogo'
+	@cd bootlogo.dir; rm $(IN_CPIO_INSTALL)
 
 message: src/main.bin help-boot/.ready po/.ready fonts/.ready
 	@rm -rf message.dir
@@ -63,6 +66,7 @@ ifdef DEFAULT_LANG
 	@echo $(DEFAULT_LANG) >>message.dir/languages
 endif
 	@sh -c 'cd message.dir; echo * | sed -e "s/ /\n/g" | cpio --quiet -o >../message'
+	@rm -r message.dir
 
 clean:
 	@for i in $(SUBDIRS) ; do [ ! -f $$i/Makefile ] ||  make -C $$i clean || break ; done
-- 
cgit v1.2.1