Fixing build issues with EPOCROOT != \
authorAdrian Issott <adrian.issott@nokia.com>
Fri, 30 Jul 2010 14:53:31 +0100
changeset 21 7b569e2061c7
parent 20 75412e452636
child 22 30834c0f3179
Fixing build issues with EPOCROOT != \
documentation/pod-list.txt
tools/fshu.pm
--- 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 <fshell/common.mmh>
-
 doc-root    \epoc32\documentation
 temp-root   \epoc32\build\documentation
 css         documentation-style.css
--- 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}|;
   }
 }