Move Makefile to project root to avoid issues with git archive

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

.gitignore

 *~
-archiso/archiso-*.tar.gz*
+archiso-*.tar.gz*

archiso/Makefile → Makefile

@@ -5,36 +5,36 @@ all:
 install: install-program install-hooks install-examples install-doc
 
 install-program:
-	install -D -m 755 mkarchiso $(DESTDIR)/usr/sbin/mkarchiso
+	install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/sbin/mkarchiso
 
 install-hooks:
 	# hooks/install are needed by mkinitcpio
-	install -D -m 644 hooks/archiso $(DESTDIR)/usr/lib/initcpio/hooks/archiso
-	install -D -m 644 install/archiso $(DESTDIR)/usr/lib/initcpio/install/archiso
-	install -D -m 755 archiso_shutdown $(DESTDIR)/usr/lib/initcpio/archiso_shutdown
-	install -D -m 644 hooks/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/hooks/archiso_shutdown
-	install -D -m 644 install/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/install/archiso_shutdown
-	install -D -m 644 archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/archiso_pxe_nbd
-	install -D -m 644 hooks/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_common
-	install -D -m 644 install/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_common
-	install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nbd
-	install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nbd
-	install -D -m 644 hooks/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_http
-	install -D -m 644 install/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_http
-	install -D -m 644 hooks/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nfs
-	install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nfs
-	install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/hooks/archiso_loop_mnt
-	install -D -m 644 install/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/install/archiso_loop_mnt
-	install -D -m 644 install/archiso_kms $(DESTDIR)/usr/lib/initcpio/install/archiso_kms
+	install -D -m 644 archiso/hooks/archiso $(DESTDIR)/usr/lib/initcpio/hooks/archiso
+	install -D -m 644 archiso/install/archiso $(DESTDIR)/usr/lib/initcpio/install/archiso
+	install -D -m 755 archiso/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/archiso_shutdown
+	install -D -m 644 archiso/hooks/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/hooks/archiso_shutdown
+	install -D -m 644 archiso/install/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/install/archiso_shutdown
+	install -D -m 644 archiso/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/archiso_pxe_nbd
+	install -D -m 644 archiso/hooks/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_common
+	install -D -m 644 archiso/install/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_common
+	install -D -m 644 archiso/hooks/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nbd
+	install -D -m 644 archiso/install/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nbd
+	install -D -m 644 archiso/hooks/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_http
+	install -D -m 644 archiso/install/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_http
+	install -D -m 644 archiso/hooks/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nfs
+	install -D -m 644 archiso/install/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nfs
+	install -D -m 644 archiso/hooks/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/hooks/archiso_loop_mnt
+	install -D -m 644 archiso/install/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/install/archiso_loop_mnt
+	install -D -m 644 archiso/install/archiso_kms $(DESTDIR)/usr/lib/initcpio/install/archiso_kms
 
 install-examples:
 	install -d -m 755 $(DESTDIR)/usr/share/archiso/
-	cp -r ../configs $(DESTDIR)/usr/share/archiso/
+	cp -r configs $(DESTDIR)/usr/share/archiso/
 
 install-doc:
 	install -d -m 755 $(DESTDIR)/usr/share/archiso/
-	install -D -m 644 ../README $(DESTDIR)/usr/share/doc/archiso/README
-	
+	install -D -m 644 README $(DESTDIR)/usr/share/doc/archiso/README
+
 uninstall:
 	rm -f $(DESTDIR)/usr/sbin/mkarchiso
 	rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso

README

@@ -458,7 +458,7 @@ When make your custom boot-pendrive, you need to copy /arch directory to it.
 
 * Install archiso.
   # git clone git://projects.archlinux.org/archiso.git
-  # make -C archiso/archiso install
+  # make -C archiso install
 
 * Build a basic iso.
   # /usr/share/archiso/configs/baseline/build.sh
@@ -474,7 +474,7 @@ used to build official images with much more things.
 
 * Install archiso.
   # git clone git://projects.archlinux.org/archiso.git
-  # make -C archiso/archiso install
+  # make -C archiso install
 
 * Build them!
   # /usr/share/archiso/configs/releng/build.sh build all