Makefile cleanup

Use -D flag for install binary instead of mkdir
Remove old boot-{cd,usb} hooks

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

1 files changed, 7 insertions, 10 deletions

diff --git a/archiso/Makefile b/archiso/Makefile
index 72abd11..56e7342 100644
--- a/archiso/Makefile
+++ b/archiso/Makefile
@@ -2,19 +2,16 @@ all:
 
 install: all
 	# install to sbin since script only usable by root
-	mkdir -p $(DESTDIR)/usr/sbin
-	install -m 755 mkarchiso $(DESTDIR)/usr/sbin
-	install -m 755 mkusbimg $(DESTDIR)/usr/sbin
+	install -D -m 755 mkarchiso $(DESTDIR)/usr/sbin
+	install -D -m 755 mkusbimg $(DESTDIR)/usr/sbin
 	# testiso can be used by anyone
-	mkdir -p $(DESTDIR)/usr/bin
-	install -m 755 testiso $(DESTDIR)/usr/bin
+	install -D -m 755 testiso $(DESTDIR)/usr/bin
 	# hooks/install are needed by mkinitcpio
-	mkdir -p $(DESTDIR)/lib/initcpio/{hooks,install}
-	install -m 644 hooks/{archiso,boot-cd,boot-usb} $(DESTDIR)/lib/initcpio/hooks/
-	install -m 644 install/{archiso,boot-cd,boot-usb} $(DESTDIR)/lib/initcpio/install/
+	install -D -m 644 hooks/archiso $(DESTDIR)/lib/initcpio/hooks/
+	install -D -m 644 install/archiso $(DESTDIR)/lib/initcpio/install/
 
 uninstall:
 	rm -f $(DESTDIR)/usr/sbin/mkarchiso
 	rm -f $(DESTDIR)/usr/bin/testiso
-	rm -f $(DESTDIR)/lib/initcpio/hooks/{archiso,boot-cd,boot-usb}
-	rm -f $(DESTDIR)/lib/initcpio/install/{archiso,boot-cd,boot-usb}
+	rm -f $(DESTDIR)/lib/initcpio/hooks/archiso
+	rm -f $(DESTDIR)/lib/initcpio/install/archiso