paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-15 12:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 108 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@109 -
This commit is contained in:
fpc 2005-05-25 21:18:51 +00:00
parent 94d1742f40
commit 868cdac308
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
installer/install.pas
View File

@ -880,6 +880,7 @@ program install;
WLibPath: boolean; WLibPath: boolean;
const const
EMXName: array [1..4] of char = 'EMX'#0; EMXName: array [1..4] of char = 'EMX'#0;
BDF2EName: array [1..6] of char = 'BDF2E'#0;
{$ENDIF} {$ENDIF}
begin begin
if haside then if haside then
@ -922,15 +923,21 @@ program install;
DosFreeModule (Handle); DosFreeModule (Handle);
end end
else else
begin if DosLoadModule (@ErrPath, SizeOf (ErrPath), @BDF2EName, Handle) = 0 then
begin
WLibPath := false;
DosFreeModule (Handle);
end
else
begin
WLibPath := true; WLibPath := true;
Inc (YB, 2); Inc (YB, 2);
end; end;
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
R.Assign(6, 6, 74, YB); R.Assign(6, 6, 74, YB);
inherited init(r,'Installation Successful.'); inherited init(r,'Installation successful.');
Options:=Options or ofCentered; Options:=Options or ofCentered;
{$IFNDEF UNIX} {$IFNDEF UNIX}
@ -941,13 +948,6 @@ program install;
insert(P); insert(P);
end; end;
if MixedCasePath then
begin
R.Assign(2, 5, 64, 6);
P:=new(pstatictext,init(r,'You need to use setpath.bat file if you want to use Makefiles'));
insert(P);
end;
{$IFDEF OS2} {$IFDEF OS2}
if WLibPath then if WLibPath then
begin begin
@ -959,7 +959,14 @@ program install;
P := New (PStaticText, Init (R, S)); P := New (PStaticText, Init (R, S));
Insert (P); Insert (P);
end; end;
{$ENDIF} {$ELSE OS2}
if MixedCasePath then
begin
R.Assign(2, 5, 64, 6);
P:=new(pstatictext,init(r,'You need to use setpath.bat file if you want to use Makefiles'));
insert(P);
end;
{$ENDIF OS2}
{$ENDIF} {$ENDIF}
R.Assign(2, YB - 13, 64, YB - 12); R.Assign(2, YB - 13, 64, YB - 12);