diff --git a/makefile b/makefile
index 0138a07..d0301e8 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,16 @@
 # Build a release of tconfpy using 'make'
-# $Id: makefile,v 1.106 2005/01/16 10:32:52 tundra Exp $
+# $Id: makefile,v 1.107 2005/01/17 07:37:02 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 
+#####
+# Definitions Relevant To This Program
+#####
+
 PROGNAME=tconfpy
 TESTPROG=test-tc
 
-VERSION   = $(shell rlog -v ${PROGNAME}.py | cut -f 2 -d " ")
-
-HEADER1   = "WHATSNEW For '${PROGNAME}' ${VERSION}    (`date`)"
-HEADER2   = "----------------------------------------------------------------------"
-
-TMPFILE   = tmpfile
-
-PREFIX    = py-${PROGNAME}
-DIR       = ${PREFIX}-${VERSION}
-TARBALL   = ${DIR}.tar.gz
+PORTNAME     = py-${PROGNAME}
 
 PROGFILES = ${PROGNAME}.py ${TESTPROG}.py
 
@@ -27,6 +22,19 @@
 
 
 #####
+# Nothing Should Need To Change Below This Line
+#####
+
+
+DIR          = ${PORTNAME}-${VERSION}
+HEADER1      = "WHATSNEW For '${PROGNAME}' ${VERSION}    (`date`)"
+HEADER2      = "----------------------------------------------------------------------"
+TARBALL      = ${DIR}.tar.gz
+TMPFILE      = tmpfile
+VERSION      = $(shell rlog -v ${PROGNAME}.py | cut -f 2 -d " ")
+
+
+#####
 # Pattern Rules
 #####
 
@@ -60,12 +68,13 @@
 %.3.gz: %.3
 	@gzip $<
 
+
 #####
 # Actual Build Rules
 #####
 
 clean:
-	@rm -rf  ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR} ${PREFIX}* ${TMPFILE}
+	@rm -rf  ${DIR} ${DOCFILES} ${PORTNAME} ${PROGFILES} ${SUPPFILES} ${TARBALL} ${TMPFILE}
 
 version:
 	@echo ${VERSION}
@@ -92,7 +101,7 @@
 release: docs progs
 	@mkdir ${DIR}
 	@mv ${DOCFILES} ${PROGFILES} ${SUPPFILES} ${DIR}
-	@tar -czvf ${DIR}.tar.gz ${DIR}
+	@tar -czvf ${TARBALL} ${DIR}
 	@rm -rf ${DIR}
 #	@mv ${DIR}.tar.gz Releases