André Hentschel : winemaker: Fix going up one directory level.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c8f415487438a0551149e03b5d7dae27663801f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c8f415487438a0551149e03b5d...

Author: André Hentschel <nerv(a)dawncrow.de>
Date:   Tue Nov 30 23:55:59 2010 +0100

winemaker: Fix going up one directory level.

---

 tools/winemaker |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 200d5ce..484cf72 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1810,7 +1810,11 @@ sub search_from($$)
       $real_path.="./";
     } elsif ($component eq "..") {
       # Go up one level
-      $dirname=dirname($dirname) . "/";
+      if ($dirname =~ /\.\.\/$/) {
+        $dirname.="../";
+      } else {
+        $dirname=dirname($dirname) . "/";
+      }
       $real_path.="../";
     } else {
       # The file/directory may have been renamed before. Also try to