Index: trunk/psconfig/mkdist
===================================================================
--- trunk/psconfig/mkdist	(revision 11730)
+++ trunk/psconfig/mkdist	(revision 12132)
@@ -26,8 +26,4 @@
     if ($ARGV[0] eq "-devtag") {
 	$setdevtag = 1;
-        shift; next;
-    }
-    if ($ARGV[0] eq "-deltag") {
-	$deltag = 1;
         shift; next;
     }
@@ -74,9 +70,6 @@
 	print STDERR "--- $cvsname[$i] ---\n";
 	if ($cvsname[$i] eq "base") { next; }
-	if ($tag[$i] eq "") {
-	    &vsystem ("cvs -q rdiff -s -r HEAD $cvsname[$i]");
-	} else {
-	    &vsystem ("cvs -q rdiff -s -r $tag[$i] $cvsname[$i]");
-	}	
+	if ($tag[$i] eq "") { next; }
+	&vsystem ("cvs -q rdiff -s -r $tag[$i] $cvsname[$i]");
 	print STDERR "\n\n";
     }
@@ -139,6 +132,10 @@
 
 sub list_distributions {
-
-    vsystem ("ls $tagsets/*.dst");
+    @list = <$tagsets/*.dst>;
+    foreach $line (@list) {
+	chomp $line;
+	($dist) = $line =~ m|$tagsets/(\S*).dst|;
+	print STDERR "$dist\n";
+    }
     exit 2;
 }
@@ -183,11 +180,14 @@
 
 sub usage {
-    print STDERR "USAGE: mkdist -list\n";
-    print STDERR "     : list valid distributions \n\n";
-    print STDERR "USAGE: mkdist (distribution) [-cvs]\n";
-    print STDERR "     : make a distribution tarball\n";
-    print STDERR "     : -cvs  : only check out the cvs tree, don't make a tarball\n\n";
-    print STDERR "USAGE: mkdist -diff (group) (version)\n";
-    print STDERR "     : show the difference between the distribution and current tree\n\n";
+    print STDERR "USAGE: mkdist [options] (distribution]\n";
+    print STDERR "     : -tag     : set tags on branch based on distribution table\n";
+    print STDERR "     : -branch  : set branch tags based on distribution table (requires -tag)\n";
+    print STDERR "     : -devtag  : set tags on cvs HEAD based on distribution table (requires -tag)\n\n";
+
+    print STDERR "     : -tarball : make a distribution tarball\n";
+    print STDERR "     : -cvs     : check out tree and leave CVS elements behind\n";
+    print STDERR "     : -module  : perform action only on the specified module\n\n";
+    print STDERR "     : -list    : list valid distributions \n\n";
+    print STDERR "     : -diff    : show the difference between the distribution and current cvs HEAD\n";
     exit 2;
 }