From 39542a6836ce2abd85a8df04af4229c888a71956 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 10 Jan 2007 15:08:43 +0000
Subject: Busybox is now properly named for the two supported architectures:
 i386 and x86_64. mkdxsinitrd includes usb keyboard stuff per default and init
 loads the modules rather early (otherwise on non-legacy machines debugging
 might be difficult)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@609 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f3be5ba0..37928d4b 100644
--- a/Makefile
+++ b/Makefile
@@ -122,10 +122,10 @@ supported."; \
 	       -p $(SLX_TFTPBOOT_PATH) \
 	       -p $(SLX_SHARE_PATH)/themes
 	@# copy license
-	@cp COPYING $(SLX_BASE_PATH)
+	@cp COPYING $(SLX_BASE_PATH)/
 	@# copy initramfs generator scripts (and inject SLX_CONFIG_PATH on the way):
-	@cp ./initramfs/mkdxsinitrd $(SLX_BIN_PATH)
-	@cp ./initramfs/slxmkramfs $(SLX_BIN_PATH)
+	@cp ./initramfs/mkdxsinitrd $(SLX_BIN_PATH)/
+	@cp ./initramfs/slxmkramfs $(SLX_BIN_PATH)/
 	@sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \
 	  -i $(SLX_BIN_PATH)/mkdxsinitrd
 	@sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \
@@ -146,13 +146,12 @@ supported."; \
 	@tar --exclude=.svn -cp -C initramfs distro-specs | \
 	  tar -xp -C $(SLX_SHARE_PATH)
 	@cp -a installer/default_files/machine-setup.default \
-	  $(SLX_SHARE_PATH)/templates
+	  $(SLX_SHARE_PATH)/templates/
 	@tar --exclude=.svn -cp -C installer/default_files tftpboot | \
 	  tar -xp -C $(SLX_SHARE_PATH)
 	@cd theming; tar --exclude=.svn -cp * | \
 	  tar -xp -C $(SLX_SHARE_PATH)/themes; cd ..
-	@# ia32 busybox should be renamed accordingly ...
-	@cp -p tools/busybox{,.links,.x86_64} installer/slxbootstrap \
+	@cp -p tools/busybox{,.links,.x86_64,.i386} installer/slxbootstrap \
 	  $(SLX_SHARE_PATH)/busybox/
 
 	@# create pre-/postinit scripts for us in initramfs:
-- 
cgit v1.2.3-55-g7522