Merged revisions 12492 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r12492 | joost | 2009-01-03 19:04:32 +0100 (Sat, 03 Jan 2009) | 1 line
  
   * Instead of using a hardcoded SystemIDEDir first try to generate it from the startup-path
........

git-svn-id: branches/fixes_2_2@12493 -

ide/fpini.pas

@@ -152,7 +152,13 @@ begin
 {$ifndef unix}
   IDEDir:=CompleteDir(DirOf(system.Paramstr(0)));
 {$else}
-  SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide/text';
+  SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide/text');
+  If Not ExistsDir(SystemIDEdir) Then
+    begin
+    SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib64/fpc/'+version_string+'/ide/text');
+    If Not ExistsDir(SystemIDEdir) Then
+      SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide/text';
+    end;
   IDEdir:=CompleteDir(FExpand('~/.fp'));
   If Not ExistsDir(IDEdir) Then
     begin