Index: src/Makefile
===================================================================
--- src/Makefile	(revision 1000)
+++ src/Makefile	(revision 1001)
@@ -2,6 +2,7 @@
 libdir ?= /usr/local/lib
 bindir ?= /usr/local/bin
 HOMEPATH := $(libdir)/mw
+TMPDIR = /tmp
 
 # These two only for change after a branch
 VERSION_MAJOR= 2
@@ -46,7 +47,7 @@
 
 ALL_CFLAGS += $(DEFS)
 
-all: mw red help
+all: mw red
 
 CODE=$(wildcard *.c)
 HDRS=$(wildcard *.h)
@@ -57,7 +58,7 @@
 	
 -include $(CODE:.c=.d)
 
-.PHONY: all setup_homepath help install clean wipe test
+.PHONY: all setup_homepath install clean wipe test
 
 messages.po: $(CODE) $(HDRS)
 	xgettext --copyright-holder="Justin Mitchell <arthur@sucs.org>" -E  --no-wrap --keyword=_ $^ -j -o messages.po 
@@ -94,8 +95,6 @@
 	touch "$(HOMEPATH)/who.bb"
 	touch "$(HOMEPATH)/log.bb"
 
-help: ../help.tar
-
 del_user: del_user.o perms.o strings.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
@@ -125,21 +124,12 @@
 	$(CC) $(LDFLAGS) -o $@ $^
 
 
-../help.tar: ../help ../help/* ../wizhelp ../wizhelp/* ../scripthelp ../scripthelp/* ../talkhelp ../talkhelp/* ../mudhelp ../mudhelp/*
-	cd .. && tar -cf help.tar --exclude RCS --exclude CVS help scripthelp wizhelp talkhelp mudhelp
+tarball: clean
+	rm -rf $(TMPDIR)/mw3-$(VERSION)
+	mkdir $(TMPDIR)/mw3-$(VERSION)
+	cp -a ../* $(TMPDIR)/mw3-$(VERSION)
+	tar zchvf $(TMPDIR)/mw3-$(VERSION).tar.gz --exclude .svn --exclude .cvsignore -C $(TMPDIR) mw3-$(VERSION)
+	rm -fr $(TMPDIR)/mw3-$(VERSION)
 
-tarball:
-	rm -rf /tmp/mw3-$(VERSION)
-	mkdir /tmp/mw3-$(VERSION)
-	mkdir /tmp/mw3-$(VERSION)/src
-	cp -a *.c *.h *.awk Makefile  /tmp/mw3-$(VERSION)/src/
-	cp -a ../COPYING ../folders.bb ../INSTALL ../LICENSE ../login.banner ../mw.spec ../README ../Makefile ../users.bb /tmp/mw3-$(VERSION)/
-	touch /tmp/mw3-$(VERSION)/who.bb /tmp/mw3-$(VERSION)/log.bb
-	mkdir -p ../mesgs
-	tar zcvhf /tmp/mw3-$(VERSION)/help.tgz --exclude .svn -C .. colour/ help/ mesgs/ mudhelp/ rooms/ scripthelp/ talkhelp/ web/ wizhelp/
-	rmdir --ignore-fail-on-non-empty ../mesgs
-	tar zchvf /tmp/mw3-$(VERSION).tar.gz --exclude .svn -C /tmp/ mw3-$(VERSION)/
-
 rpm: tarball
-	rpmbuild -tb /tmp/mw3-$(VERSION).tar.gz
-	rm -fr /tmp/mw3-$(VERSION)
+	rpmbuild -tb $(TMPDIR)/mw3-$(VERSION).tar.gz