# HG changeset patch # User Adrian Issott # Date 1280498011 -3600 # Node ID 7b569e2061c7c8cd89d0efdeca2562d44b47a110 # Parent 75412e452636aed4e3edc17a296161f21626a2c2 Fixing build issues with EPOCROOT != \ diff -r 75412e452636 -r 7b569e2061c7 documentation/pod-list.txt --- a/documentation/pod-list.txt Thu Jul 29 19:16:52 2010 +0100 +++ b/documentation/pod-list.txt Fri Jul 30 14:53:31 2010 +0100 @@ -1,5 +1,3 @@ -#include - doc-root \epoc32\documentation temp-root \epoc32\build\documentation css documentation-style.css diff -r 75412e452636 -r 7b569e2061c7 tools/fshu.pm --- a/tools/fshu.pm Thu Jul 29 19:16:52 2010 +0100 +++ b/tools/fshu.pm Fri Jul 30 14:53:31 2010 +0100 @@ -94,6 +94,11 @@ } $path = join('\\', @collapsedPath); + if ($path =~ m|^\\epoc32|) { + # If it starts with \epoc32, chop the leading backslash and stick on $EPOCROOT + $path =~ s|^\\|$ENV{EPOCROOT}|; + } + return $path; } @@ -124,9 +129,9 @@ mkpath($dir) or die "Couldn't make path \"$dir\": $!\n"; } } - if ($dir =~ /^\\epoc32/) { + if ($dir =~ m|^\\epoc32|) { # If it starts with \epoc32, chop the leading backslash and stick on $EPOCROOT - $dir =~ s/^\\/$ENV{EPOCROOT}/; + $dir =~ s|^\\|$ENV{EPOCROOT}|; } }