install-iso Makefile cleanup

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

1 files changed, 20 insertions, 12 deletions

diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index c2607e3..63dabc5 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -5,6 +5,7 @@ kver=2.6.27-ARCH
 ARCH=i686
 
 WORKDIR=work
+BOOTLOADER=grub-gfx
 
 PWD=`pwd`
 FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
@@ -14,36 +15,43 @@ all: core-iso core-usb ftp-iso ftp-usb
 all-iso: core-iso ftp-iso 
 all-usb: core-usb ftp-usb
 
-core-usb: core-pkgs overlay
-	mkarchiso -v -p grub-gfx usb $(WORKDIR) $(FTPname).iso
+core-usb: core-pkgs overlay $(BOOTLOADER)
+	mkarchiso -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).iso
 
-core-iso: core-pkgs overlay
-	mkarchiso -v -p grub-gfx iso $(WORKDIR) $(FTPname).iso
+core-iso: core-pkgs overlay $(BOOTLOADER)
+	mkarchiso -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
 
-ftp-usb: overlay
-	mkarchiso -v -p grub-gfx usb $(WORKDIR) $(FTPname).img
+ftp-usb: overlay $(BOOTLOADER)
+	mkarchiso -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img
 
-ftp-iso: overlay
-	mkarchiso -v -p grub-gfx iso $(WORKDIR) $(FTPname).iso
+ftp-iso: overlay $(BOOTLOADER)
+	mkarchiso -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
 
 overlay: base-iso
 	cp -r overlay $(WORKDIR)/
 
 root-image:
-	mkarchiso -v -p "`cat packages.list-$(ARCH)`" create $(WORKDIR)
+	mkarchiso -p "`cat packages.list-$(ARCH)` $(BOOTLOADER)" create $(WORKDIR)
 	
 base-iso: root-image
 	mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
 	cp -r boot-files/* $(WORKDIR)/iso/boot/
-	cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub
-	cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
 	
 	mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso-ide.img
 	mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso-pata.img
 
+grub-gfx:
+	cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub
+
+grub:
+	cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub
+
+isolinux:
+	cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
+
 core-pkgs: base-iso
 	mkdir $(WORKDIR)/core-pkgs/
 	wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH)
 
 clean:
-	rm -rf $(WORKDIR) image-dir $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso
+	rm -rf $(WORKDIR) $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso