--- trunk/mkinitrd-magellan/Makefile	2010/08/19 08:26:49	1131
+++ tags/mkinitrd-6_5_0/Makefile	2011/06/03 21:22:00	1345
@@ -3,7 +3,7 @@
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
-SUBDIRS = grubby livecd isolinux
+SUBDIRS = livecd isolinux
 
 #ifeq ($(ARCH),sparc)
 #SUBDIRS += loadinitrd
@@ -24,12 +24,14 @@
 	# 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 's:%VERSIONTAG%:$(VERSION):' < mkinitrd.in > mkinitrd
 
 test:	all
-	for i in grubby busybox klibc; do make -C $$i test; done
+	for i in busybox klibc; do make -C $$i test; done
 
 install:
 	for n in $(SUBDIRS); do make -C $$n install DESTDIR=$(DESTDIR); done
@@ -39,7 +41,6 @@
 		fi; \
 	done
 	install -m755 mkinitrd $(DESTDIR)/sbin/mkinitrd
-	install -m755 installkernel $(DESTDIR)/sbin/installkernel
 	chmod 755 $(DESTDIR)/sbin/mkinitrd
 	install -m644 mkinitrd.8 $(DESTDIR)/$(mandir)/man8/mkinitrd.8
 	install -m644 mkinitrd.confd $(DESTDIR)/etc/conf.d/mkinitrd
@@ -54,7 +55,7 @@
 clean:
 	for n in $(SUBDIRS) busybox klibc isolinux; do make -C $$n clean; done
 	rm -f mkinitrd
-	rm klibc/linux
+	rm -f klibc/linux
 
 mrproper: clean
 	make -C busybox mrproper