paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 05:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed using / as path delimiter for Makefile.fpc for packages

Browse Source 
git-svn-id: trunk@8524 -
This commit is contained in:
mattias 2006-01-15 23:31:23 +00:00
parent 72fff304ac
commit 9278bbf72a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packager/pkgmanager.pas
View File

@ -1197,6 +1197,7 @@ end;
function TPkgManager.DoWriteMakefile(APackage: TLazPackage): TModalResult;
var
CompilerOptionStrings: TInheritedCompOptsStrings;
PathDelimNeedsReplace: Boolean;
procedure Replace(var s: string; const SearchTxt, ReplaceTxt: string);
var
@ -1239,16 +1240,16 @@ var
TrimSearchPath(ConvertLazarusToMakefileMakros(s),''),
APackage.Directory);
Replace(Result,';',' ');
if PathDelim<>'/' then
Replace(Result,'\','/');
if PathDelimNeedsReplace then
Replace(Result,PathDelim,'/');
end;
function ConvertLazarusToMakefileDirectory(const s: string): string;
begin
Result:=CreateRelativePath(TrimFilename(
ConvertLazarusToMakefileMakros(s)),APackage.Directory);
if PathDelim<>'/' then
Replace(Result,'\','/');
if PathDelimNeedsReplace then
Replace(Result,PathDelim,'/');
end;
procedure AddCompilerOptions(ParsedOpts: TParsedCompilerOptions);
@ -1349,6 +1350,8 @@ var
CompilerOptionStrings[o]:=CreateRelativeSearchPath(
CompilerOptionStrings[o]+';.',BaseDir);
Replace(CompilerOptionStrings[o],';',' ');
if PathDelimNeedsReplace then
Replace(CompilerOptionStrings[o],PathDelim,'/');
end;
end;
end;
@ -1368,6 +1371,7 @@ var
CodeBuffer: TCodeBuffer;
begin
Result:=mrCancel;
PathDelimNeedsReplace:=PathDelim<>'/';
GatherCompilerOptions;
@ -1375,6 +1379,7 @@ begin
MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename)));
UnitPath:=CompilerOptionStrings[icoUnitPath];
UnitOutputPath:=APackage.CompilerOptions.GetUnitOutPath(false,false);
DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
UnitOutputPath:=ConvertLazarusToMakefileDirectory(UnitOutputPath);