--- epm.orig	2004-03-29 23:27:25.000000000 -0800
+++ epm	2004-03-29 23:38:03.000000000 -0800
@@ -264,8 +264,8 @@
 	echo \$CONFIG_PROTECT`;
 	die "CONFIG_PROTECT is empty" unless @CONFIG_PROTECT;
 	my $confprotre = join '|', @CONFIG_PROTECT;
-	@files = grep { 
-	    (split ' ')[1] =~ /^($confprotre)/o 
+	@files = grep {
+	    (split ' ', $_, 2)[1] =~ /^($confprotre)/o 
 	} @files;
     }
 
@@ -274,7 +274,7 @@
 	# We don't have a variable like CONFIG_PROTECT to work
 	# with, so just fake it...  :-)
 	@files = grep { 
-	    (split ' ', $_)[1] =~ m/\/(?:doc|man|info)\//o 
+	    (split ' ', $_, 2)[1] =~ m/\/(?:doc|man|info)\//o 
 	} @files;
     }
 
@@ -286,17 +286,7 @@
     # Otherwise do some work so that intermediate directories
     # aren't listed
     else {
-	for (my $i=0; $i < @files; $i++) {
-	    my ($f1) = $files[$i];
-	    $f1 = (split ' ', $f1)[1];
-	    if ($i < @files-1) {
-		my $f2 = $files[$i+1];
-		$f2 = (split ' ', $f2)[1];
-		vverb "Comparing $f1 to $f2";
-		next if $f2 =~ m#^\Q$f1\E/#;
-	    }
-	    print $f1, "\n";
-	}
+    	print grep { /^obj / && s/^obj (.*?) \w+ \d+$/$1/ } @files;
     }
 }