Test -e $PLAN9/bin/rc in wmii script. Use AWKPATH config.mk flag instead of /usr/bin/awk.

Makefile

@@ -58,7 +58,9 @@ install: all
 	@echo installing executable files to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p -m 0755 ${DESTDIR}${PREFIX}/bin
 	@for i in ${SCRIPTS}; do \
-		sed 's|CONFPREFIX|${CONFPREFIX}|g; s|CONFVERSION|${CONFVERSION}|g' < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
+		sed 's|CONFPREFIX|${CONFPREFIX}|g; \
+		      s|CONFVERSION|${CONFVERSION}|g; \
+		      s|AWKPATH|${AWKPATH}|g' < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
 		chmod 755 ${DESTDIR}${PREFIX}/bin/$$i; \
 	 done
 	@for i in ${BIN}; do\

config.mk

@@ -8,6 +8,7 @@ CONFVERSION = 3.5
 PREFIX = /usr/local
 CONFPREFIX = ${PREFIX}/etc
 MANPREFIX = ${PREFIX}/share/man
+AWKPATH = /usr/bin/awk
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib

wmii

@@ -7,7 +7,7 @@ export WMII_ADDRESS="unix!$WMII_NS_DIR/wmii"
 
 if [ -x /usr/local/plan9/bin/rc ]; then
 	WMIIRC=`PATH="$WMII_CONFPATH:$PATH" which rc.wmii`
-elif [ -n "$PLAN9" ]; then
+elif [ -x "$PLAN9/bin/rc" ]; then
 	WMIIRC="$PLAN9/bin/rc `PATH="$WMII_CONFPATH:$PATH" which rc.wmii`"
 else
 	WMIIRC=`PATH="$WMII_CONFPATH:$PATH" which wmiirc`

wmiiloop

@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!AWKPATH -f
 /^#/ && $2 !~ /^Events|Actions|Key$/ || !begin, \
 /^#/ && $2 ~ /^(Events|Actions|Key)$/ {
 	begin = 1