paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-25 22:37:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

* compilation fixed

Browse Source 
git-svn-id: trunk@29216 -
This commit is contained in:
florian 2014-12-07 22:01:50 +00:00
parent 6bcb46eb30
commit 8508d25f8e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fpmkunit/src/fpmkunit.pp
View File

@ -210,8 +210,8 @@ Const
{ android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false),
{ nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false),
{ msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true ), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true ),
{ wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false ), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false),
{ aros } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false ) { aros } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false),
{ dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false ) { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false )
); );
@ -3798,7 +3798,7 @@ function TCustomDefaults.GetDocInstallDir: String;
begin begin
If (FDocInstallDir<>'') then If (FDocInstallDir<>'') then
Result:=FDocInstallDir Result:=FDocInstallDir
else if Defaults.BuildOS=freebsd or Defaults.BuildOS=dragonfly then else if (Defaults.BuildOS=freebsd) or (Defaults.BuildOS=dragonfly) then
result := Prefix+PathDelim+'share'+PathDelim+'doc'+PathDelim+'$(PackageName)' result := Prefix+PathDelim+'share'+PathDelim+'doc'+PathDelim+'$(PackageName)'
else If UnixPaths then else If UnixPaths then
Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)' Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'
@ -3811,7 +3811,7 @@ function TCustomDefaults.GetExamplesInstallDir: String;
begin begin
If (FExamplesInstallDir<>'') then If (FExamplesInstallDir<>'') then
Result:=FExamplesInstallDir Result:=FExamplesInstallDir
else if Defaults.BuildOS=freebsd or Defaults.BuildOS=dragonfly then else if (Defaults.BuildOS=freebsd) or (Defaults.BuildOS=dragonfly) then
result := Prefix+PathDelim+'share'+PathDelim+'examples'+PathDelim+'$(PackageName)' result := Prefix+PathDelim+'share'+PathDelim+'examples'+PathDelim+'$(PackageName)'
else If UnixPaths then else If UnixPaths then
Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'+PathDelim+'examples' Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'+PathDelim+'examples'

2
utils/fpcm/revision.inc
View File

@ -1 +1 @@
'2014-08-17 rev 28432' '2014-12-07 rev 29213'