# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1273079118 -3600
# Node ID 62301b3b197e53e23c1393de94618e976400139f
# Parent  86a1ec9fa7bae6b03c1f9017ebbd0bdbc13a73ef
Get the full fix for Bug 2509 into Symbian^4 branch

diff -r 86a1ec9fa7ba -r 62301b3b197e sbsv1_os/e32toolp/genutil/listzip.pl
--- a/sbsv1_os/e32toolp/genutil/listzip.pl	Wed May 05 09:19:45 2010 +0100
+++ b/sbsv1_os/e32toolp/genutil/listzip.pl	Wed May 05 18:05:18 2010 +0100
@@ -32,6 +32,9 @@
     _print_err_and_die("$prefix is not a directory.") unless -d $prefix;
     _print_err_and_die("$zipf doesn't exist.") unless -f $zipf;
 
+    $prefix =~ s/\/\//\//g;    # SBS provides "Q://", so reduce the doubling
+    $prefix =~ s/\/$//;        # remove trailing /, if any
+		
     my @raw_data = qx/unzip -l $zipf/;
 
     for (@raw_data)
diff -r 86a1ec9fa7ba -r 62301b3b197e toolsandutils/buildsystem/extension/tools/compsupp.mk
--- a/toolsandutils/buildsystem/extension/tools/compsupp.mk	Wed May 05 09:19:45 2010 +0100
+++ b/toolsandutils/buildsystem/extension/tools/compsupp.mk	Wed May 05 18:05:18 2010 +0100
@@ -37,7 +37,7 @@
 SAVESPACE : do_nothing
 
 RELEASABLES :
-		@perl -S $(EPOCROOT)epoc32/tools/listzip.pl $(EPOCROOT) $(FILE)
+		@perl -S $(EPOCROOT)epoc32/tools/listzip.pl $(TODIR) $(FILE)
 
 CLEAN : do_nothing