--- trunk/mkinitrd-magellan/Makefile	2007/09/02 00:38:20	560
+++ tags/mkinitrd-6_3_0/Makefile	2010/08/19 10:14:02	1139
@@ -3,7 +3,7 @@
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
-SUBDIRS = nash grubby livecd isolinux
+SUBDIRS = grubby livecd isolinux
 
 #ifeq ($(ARCH),sparc)
 #SUBDIRS += loadinitrd
@@ -14,16 +14,21 @@
 #endif
 
 OPTCFLAGS = $(CFLAGS)
+LINUX_SOURCES=/usr/src/linux
 
 mandir = usr/share/man
 docdir = usr/share/doc/mkinitrd-$(VERSION)
 
 all:
 	for n in $(SUBDIRS); do make -C $$n; done
+	# use linux sources from default path, not the installed kernel
+	ln -snf $(LINUX_SOURCES) klibc/linux
 	make -C klibc
+	# force chmod +x for scripts in busybox
+	chmod +x busybox/scripts/*.sh
 	make -C busybox defconfig
 	make -C busybox
-	sed -i 's/%VERSIONTAG%/$(VERSION)/' mkinitrd
+	sed 's:%VERSIONTAG%:$(VERSION):' < mkinitrd.in > mkinitrd
 
 test:	all
 	for i in grubby busybox klibc; do make -C $$i test; done
@@ -50,6 +55,8 @@
 
 clean:
 	for n in $(SUBDIRS) busybox klibc isolinux; do make -C $$n clean; done
+	rm -f mkinitrd
+	rm -f klibc/linux
 
 mrproper: clean
 	make -C busybox mrproper