* Scripts/webkitdirs.pm: Fixed a regular expression in the code I just landed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9d5f97b2854800838c3272add1dea8a33fb5ccf3..695fc9ab859b35806e0c660a1aa00d26e9b7551b 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-23  Darin Adler  <darin@apple.com>
+
+        * Scripts/webkitdirs.pm: Fixed a regular expression in the code I just landed.
+
 2005-06-23  Darin Adler  <darin@apple.com>
 
         Changes based on input from Michael Kahl.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index d9c73db43f95debca2600cf3298c6e05ee158a1e..5981921b32d0c2d41abb5f0345cd1f7308c40061 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -77,8 +77,8 @@ sub determineBaseProductDir
     close PRODUCT;
     if ($baseProductDir) {
         chomp $baseProductDir;
-        $baseProductDir =~ s|^\$(SRCROOT)/\.\.$|$sourceDir|;
-        $baseProductDir =~ s|^\$(SRCROOT)/\.\./|$sourceDir/|;
+        $baseProductDir =~ s|^\Q$(SRCROOT)/..\E$|$sourceDir|;
+        $baseProductDir =~ s|^\Q$(SRCROOT)/../|$sourceDir/|;
         $baseProductDir =~ s|^~/|$ENV{HOME}/|;
         die "Can't handle Xcode product directory with a ~ in it.\n" if $baseProductDir =~ /~/;
         die "Can't handle Xcode product directory with a variable in it.\n" if $baseProductDir =~ /\$/;