Index: /trunk/locker-bin/macathenaDist.py
===================================================================
--- /trunk/locker-bin/macathenaDist.py (revision 31)
+++ /trunk/locker-bin/macathenaDist.py (revision 33)
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
-def packageCvs(module, cvsModule, cvsroot='/afs/dev.mit.edu/source/repository', getAutoconf='packs/build/autoconf', date='tomorrow'):
+def packageCvs(module, cvsModule, extras=['packs/build/autoconf'], cvsroot='/afs/dev.mit.edu/source/repository', date='tomorrow'):
 	import os
 	import time
@@ -13,6 +13,7 @@
 	os.system('cvs -R export -D %s %s >/dev/null 2>/dev/null' % (date, cvsModule))
 	
-	if getAutoconf:
-		os.system('cvs -R export -r HEAD -d %s %s >/dev/null 2>/dev/null' % (cvsModule, getAutoconf))
+	if extras:
+		for extra in extras:
+			os.system('cvs -R export -D %s -d %s %s >/dev/null 2>/dev/null' % (date, cvsModule, extra))
 	
 	stamp = 0
@@ -34,5 +35,5 @@
 	print 'Created /mit/macathena/dist/%s.tar.gz' % tarball
 
-modules = {'moira': ['moira', '/afs/athena.mit.edu/astaff/project/moiradev/repository', False],
+modules = {'moira': ['moira', False, '/afs/athena.mit.edu/astaff/project/moiradev/repository'],
 	'libathdir': ['athena/lib/athdir'],
 	'athdir': ['athena/bin/athdir'],
@@ -41,7 +42,9 @@
 	'athrun': ['athena/bin/athrun'],
 	'athinfo': ['athena/bin/athinfo'],
-	'getcluster': ['athena/bin/getcluster'],
+	'getcluster': ['athena/bin/getcluster', ['packs/build/autoconf', 'packs/build/aclocal.m4']],
 	'libxj': ['athena/lib/Xj'],
-	'xcluster': ['athena/bin/xcluster']}
+	'libss': ['athena/lib/ss'],
+	'xcluster': ['athena/bin/xcluster'],
+	'discuss': ['athena/bin/discuss']}
 
 if __name__ == '__main__':