add minor tweaks to make testing a bit easier

Since INSTDIR and HOOKDIR are understood as arrays now, declare them as
such with the local 'hooks' and 'install' first to override the local
FS. This makes the missing udev error go away and allows easier testing
of other out of tree hooks.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 46b0b09..a81c818 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ DIST_EXTRA = \
 all: doc
 
 install: all
+	mkdir -p ${DESTDIR}
 	$(foreach dir,${DIRS},install -dm755 ${DESTDIR}${dir};)
 
 	sed -e 's|^CONFIG=.*|CONFIG=/etc/mkinitcpio.conf|' \
diff --git a/mkinitcpio b/mkinitcpio
index bb34add..b72557a 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -17,8 +17,8 @@ shopt -s extglob
 # Settings
 FUNCTIONS=functions
 CONFIG=mkinitcpio.conf
-HOOKDIR=hooks
-INSTDIR=install
+HOOKDIR=(hooks /usr/lib/initcpio/hooks /lib/initcpio/hooks)
+INSTDIR=(install /usr/lib/initcpio/install /lib/initcpio/install)
 PRESETDIR=mkinitcpio.d
 COMPRESSION=gzip