fix-IDE-data-file-location

===================================================================

Gbp-Pq: Name fix-IDE-data-file-location.patch

diff --git a/fpcsrc/ide/fpini.pas b/fpcsrc/ide/fpini.pas
index f91168355d1efefa9f2510411d5dd81a0f758db7..3cc22261f26641a57ed96d5f3ceba73fbd190626 100644 (file)
--- a/fpcsrc/ide/fpini.pas
+++ b/fpcsrc/ide/fpini.pas
@@ -178,12 +178,12 @@ begin
    end;
 {$endif WINDOWS}
 {$else}
-  SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide/text');
+  SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide');
   If Not ExistsDir(SystemIDEdir) Then
     begin
-    SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib64/fpc/'+version_string+'/ide/text');
+    SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib64/fpc/'+version_string+'/ide');
     If Not ExistsDir(SystemIDEdir) Then
-      SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide/text';
+      SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide';
     end;
   IDEdir:=CompleteDir(FExpand('~/.fp'));
   If Not ExistsDir(IDEdir) Then

diff --git a/fpcsrc/ide/fpmake.pp b/fpcsrc/ide/fpmake.pp
index 60c437ea454470df4c1df41c3b1a590edfd24711..6348f7c362193e2e3aabdba9fb5fcf07541d05df 100644 (file)
--- a/fpcsrc/ide/fpmake.pp
+++ b/fpcsrc/ide/fpmake.pp
@@ -204,16 +204,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/fpcsrc/ide/fptemplt.pas b/fpcsrc/ide/fptemplt.pas
index d22933be12d5b3b035fc6d37d5ace56ef2f93427..12c1e598bd67b053f63fce4329767c9cbb613875 100644 (file)
--- a/fpcsrc/ide/fptemplt.pas
+++ b/fpcsrc/ide/fptemplt.pas
@@ -280,6 +280,7 @@ begin
   New(Templates, Init(10,10));
   ScanDir('.');
   ScanDir(IDEDir);
+  ScanDir(SystemIDEDir);
 end;