From a2aca9c25b6a61a41fc0b1e30c59886c5dbb6da6 Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Mon, 25 Jan 2021 21:36:28 +0000 Subject: [PATCH] Align fp IDE template file paths with Debian standards The fp IDE looks for template files in /usr/bin where itself is installed. However this is not conform with Debian stadard for file locations. This patch fixes this by making the IDE looking for templates in the base installation directory. =================================================================== Gbp-Pq: Name fix-IDE-data-file-location.patch --- fpcsrc/packages/ide/fpini.pas | 6 +++--- fpcsrc/packages/ide/fpmake.pp | 20 ++++++++++---------- fpcsrc/packages/ide/fptemplt.pas | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/fpcsrc/packages/ide/fpini.pas b/fpcsrc/packages/ide/fpini.pas index cb5d740f..18ec55d3 100644 --- a/fpcsrc/packages/ide/fpini.pas +++ b/fpcsrc/packages/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/packages/ide/fpmake.pp b/fpcsrc/packages/ide/fpmake.pp index 7f8e60fd..1a4db226 100644 --- a/fpcsrc/packages/ide/fpmake.pp +++ b/fpcsrc/packages/ide/fpmake.pp @@ -282,16 +282,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/packages/ide/fptemplt.pas b/fpcsrc/packages/ide/fptemplt.pas index d22933be..12c1e598 100644 --- a/fpcsrc/packages/ide/fptemplt.pas +++ b/fpcsrc/packages/ide/fptemplt.pas @@ -280,6 +280,7 @@ begin New(Templates, Init(10,10)); ScanDir('.'); ScanDir(IDEDir); + ScanDir(SystemIDEDir); end; -- 2.30.2