wmii

commit 0bcc957879d4391746d2b0396261c8225ef60951
parent af678f9c6a6a7a3ef4039b224233508430933068
Author: Kris Maglione <jg@suckless.org>
Date:   Mon, 26 Feb 2007 06:53:02 -0500

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

Diffstat:
Makefile
 | 
4
+++-
config.mk
 | 
1
+
wmii
 | 
2
+-
wmiiloop
 | 
2
+-

4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/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\
diff --git a/config.mk b/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
diff --git a/wmii b/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`
diff --git a/wmiiloop b/wmiiloop
@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!AWKPATH -f
 /^#/ && $2 !~ /^Events|Actions|Key$/ || !begin, \
 /^#/ && $2 ~ /^(Events|Actions|Key)$/ {
 	begin = 1