ALT Linux repos
Group :: Development/Other
RPM: fpc
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: fpc-fix-IDE-data-file-location.patch
Download
Download
diff --git a/fpcbuild/fpcsrc/packages/ide/fpmake.pp b/fpcbuild/fpcsrc/packages/ide/fpmake.pp
index a9fa343..c9175b0 100644
--- a/fpcbuild/fpcsrc/packages/ide/fpmake.pp
+++ b/fpcbuild/fpcsrc/packages/ide/fpmake.pp
@@ -266,16 +266,16 @@ begin
T.Directory:='compiler';
T.Install:=false;
- P.InstallFiles.Add('fp.ans','$(bininstalldir)');
- P.InstallFiles.Add('gplprog.pt','$(bininstalldir)');
- P.InstallFiles.Add('gplunit.pt','$(bininstalldir)');
- P.InstallFiles.Add('program.pt','$(bininstalldir)');
- P.InstallFiles.Add('unit.pt','$(bininstalldir)');
- P.InstallFiles.Add('cvsco.tdf','$(bininstalldir)');
- P.InstallFiles.Add('cvsdiff.tdf','$(bininstalldir)');
- P.InstallFiles.Add('cvsup.tdf','$(bininstalldir)');
- P.InstallFiles.Add('grep.tdf','$(bininstalldir)');
- P.InstallFiles.Add('tpgrep.tdf','$(bininstalldir)');
+ P.InstallFiles.Add('fp.ans','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('gplprog.pt','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('gplunit.pt','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('program.pt','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('unit.pt','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('cvsco.tdf','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('cvsdiff.tdf','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('cvsup.tdf','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('grep.tdf','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('tpgrep.tdf','$(baseinstalldir)/ide');
P.InstallFiles.Add('fp32.ico', [win32, win64], '$(bininstalldir)');
with P.Sources do
diff --git a/fpcbuild/fpcsrc/packages/ide/fptemplt.pas b/fpcbuild/fpcsrc/packages/ide/fptemplt.pas
index d22933b..12c1e59 100644
--- a/fpcbuild/fpcsrc/packages/ide/fptemplt.pas
+++ b/fpcbuild/fpcsrc/packages/ide/fptemplt.pas
@@ -280,6 +280,7 @@ begin
New(Templates, Init(10,10));
ScanDir('.');
ScanDir(IDEDir);
+ ScanDir(SystemIDEDir);
end;