diff options
| author | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-01-05 23:05:03 +0000 |
|---|---|---|
| committer | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-01-05 23:05:03 +0000 |
| commit | 28be71166387c84a345f8b51a030b8ae43a35641 (patch) | |
| tree | e52865ae402ad870fd75a4fc192eb8738335e8c4 /installer/install.pas | |
| parent | 7c237a672bfec7da5f7f3b8039728423bcba1a56 (diff) | |
| download | fpc-28be71166387c84a345f8b51a030b8ae43a35641.tar.gz | |
* fix check for necessity of LIBPATH changes
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@16714 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'installer/install.pas')
| -rw-r--r-- | installer/install.pas | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/installer/install.pas b/installer/install.pas index 664bf35465..4975ec572c 100644 --- a/installer/install.pas +++ b/installer/install.pas @@ -872,12 +872,16 @@ program install; begin WLibPath := false; DosFreeModule (Handle); - end - else - if DosLoadModule (@ErrPath, SizeOf (ErrPath), @BFD2EName, Handle) = 0 then - begin - WLibPath := false; - DosFreeModule (Handle); + if DosLoadModule (@ErrPath, SizeOf (ErrPath), @BFD2EName, Handle) = 0 then + begin + WLibPath := false; + DosFreeModule (Handle); + end + else + begin + WLibPath := true; + Inc (YB, 2); + end; end else begin @@ -903,9 +907,11 @@ program install; if WLibPath then begin if WPath then - S := 'and your LIBPATH with ''' + S + '\dll''' + S := 'and your LIBPATH with ''' + S else - S := 'Extend your LIBPATH with ''' + S + '\dll'''; + S := 'Extend your LIBPATH with ''' + S; + System.Delete (S, Length (S) - 3, 4); + S := S + '\dll'''; R.Assign (2, YB - 14, 64, YB - 12); P := New (PStaticText, Init (R, S)); Insert (P); @@ -921,7 +927,7 @@ program install; {$ENDIF} R.Assign(2, YB - 13, 64, YB - 12); - P:=new(pstatictext,init(r,'To compile files enter fpc [file]''')); + P:=new(pstatictext,init(r,'To compile files enter ''fpc [file]''')); insert(P); if haside then |