From a15d7330b63f0f8d0ab49408fb48eaf957d9f986 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 4 Jun 2013 21:42:09 +0000
Subject: [PATCH] Codetools: use CreateRelativePath() in FixIncludeFilenames.

git-svn-id: trunk@41544 -
---
 components/codetools/stdcodetools.pas | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/codetools/stdcodetools.pas b/components/codetools/stdcodetools.pas
index bdbd41ead5..106679c276 100644
--- a/components/codetools/stdcodetools.pas
+++ b/components/codetools/stdcodetools.pas
@@ -6405,8 +6405,7 @@ var
     end;
   end;}
   
-  procedure Add(FilenameSrcPos: integer; const AFilename: string;
-    Found: boolean);
+  procedure Add(FilenameSrcPos: integer; const AFilename: string; Found: boolean);
   var
     NewFilename: String;
     p: PCodeXYPosition;
@@ -6429,8 +6428,7 @@ var
     end;
   end;
   
-  function SearchIncludeFilename(FilenameSrcPos: integer;
-    const AFilename: string): string;
+  function SearchIncludeFilename(FilenameSrcPos: integer; const AFilename: string): string;
   var
     AFilePath: String;
     BaseDir: String;
@@ -6453,7 +6451,7 @@ var
         if AFilePath<>'' then begin
           // search relative to unit
           CurFilename:=DirectoryCache.Pool.FindDiskFilename(BaseDir+Result,true);
-          Result:=copy(CurFilename,length(BaseDir)+1,length(CurFilename));
+          Result:=CreateRelativePath(CurFilename, BaseDir);
           if FileExistsCached(CurFilename) then
             Add(FilenameSrcPos,CurFilename,true)
           else
@@ -6468,8 +6466,7 @@ var
             if Scanner.Values.IsDefined('DELPHI') then
               PathDivider:=':'
           end;
-          CurFilename:=SearchFileInPath(Result,BaseDir,IncludePath,PathDivider,
-                                   ctsfcAllCase);
+          CurFilename:=SearchFileInPath(Result,BaseDir,IncludePath,PathDivider, ctsfcAllCase);
           if CurFilename<>'' then begin
             // found
             Result:=CreateRelativePath(CurFilename,BaseDir);