--- wmii-3.1.old/Makefile	2006-07-22 13:56:42.491923498 +0200
+++ wmii-3.1.old/Makefile	2006-07-22 14:08:23.674327570 +0200
@@ -18,7 +18,7 @@ 
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 	@for i in ${SUBDIRS} cmd/wm; do \
-		(cd $$i; make) \
+		(cd $$i; $(MAKE)) \
 	done
 
 dist: clean
--- wmii-3.1.old/cmd/wm/wmii	2006-07-22 13:56:42.583909514 +0200
+++ wmii-3.1.old/cmd/wm/wmii	2006-07-22 14:32:57.537266347 +0200
@@ -3,13 +3,18 @@ 
 
 wmiiwm -c || exit 1
 
+if [ -d $HOME/.wmii-3 ]; then
+	SHOW_WELCOME=false
+fi
+
 OLD_PATH=$PATH export OLD_PATH
 PATH=$HOME/.wmii-3:CONFPREFIX/wmii-3:$PATH export PATH
-WMII_ADDRESS=unix!/tmp/ns.$USER.${DISPLAY%.0}/wmii export WMII_ADDRESS
+NAMESPACE=$HOME/.wmii-3/ns${DISPLAY%.0}
+WMII_ADDRESS=unix!$NAMESPACE/wmii export WMII_ADDRESS
 
-mkdir -m 700 /tmp/ns.$USER.${DISPLAY%.0} 2>/dev/null
+mkdir -p -m 700 $NAMESPACE 2>/dev/null
 wmiiwm -a $WMII_ADDRESS &
 wmiiwmpid=$!
-mkdir $HOME/.wmii-3 2>/dev/null && welcome &
+$SHOW_WELCOME && welcome
 wmiirc &
 wait $wmiiwmpid
--- wmii-3.1.old/cmd/wm/wmii.1	2006-07-22 13:56:42.583909514 +0200
+++ wmii-3.1.old/cmd/wm/wmii.1	2006-07-22 14:25:04.571168122 +0200
@@ -42,7 +42,7 @@ 
 bindings, the bar labels, etc.
 .SH FILES
 .TP
-/tmp/ns.$USER.${DISPLAY%.0}/wmii
+$HOME/.wmii-3/ns.${DISPLAY%.0}/wmii
 The wmii socket file which provides a 9P service.
 .TP
 CONFPREFIX/wmii-3
--- wmii-3.1.old/rc/wmiirc	2006-07-22 13:56:42.504921522 +0200
+++ wmii-3.1.old/rc/wmiirc	2006-07-22 14:24:22.995488586 +0200
@@ -51,7 +51,7 @@ 
 # MISC
 xsetroot -solid '#333333'
 status &
-PROGS_FILE=`mktemp /tmp/.wmiimenu.proglist.XXXXXX` || exit 2
+PROGS_FILE=$HOME/.wmii-3/wmiimenu.proglist
 proglist `echo "$OLD_PATH" | tr : ' '` >$PROGS_FILE &
 
 # SHORTCUTS