Description: set default project path to match Debian Ada policy
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Forwarded: not-needed

Index: gprbuild-1.3.0/gnat/prj-ext.adb
===================================================================
--- gprbuild-1.3.0.orig/gnat/prj-ext.adb	2010-03-03 07:18:03.000000000 -0500
+++ gprbuild-1.3.0/gnat/prj-ext.adb	2010-03-03 07:18:25.000000000 -0500
@@ -24,7 +24,6 @@
 ------------------------------------------------------------------------------
 
 with Hostparm;
-with Makeutl;  use Makeutl;
 with Output;   use Output;
 with Osint;    use Osint;
 with Sdefault;
@@ -252,37 +251,10 @@
 
       --  Set the initial value of Current_Project_Path
 
-      if Add_Default_Dir then
-         declare
-            Prefix : String_Ptr := Sdefault.Search_Dir_Prefix;
-         begin
-            if Prefix = null then
-               Prefix := new String'(Executable_Prefix_Path);
-
-               if Prefix.all /= "" then
-                  if Get_Mode = Multi_Language then
-                     Add_Str_To_Name_Buffer
-                       (Path_Separator & Prefix.all &
-                        "share" & Directory_Separator & "gpr");
-                  end if;
-
-                  Add_Str_To_Name_Buffer
-                    (Path_Separator & Prefix.all &
-                     Directory_Separator & "lib" &
-                     Directory_Separator & "gnat");
-               end if;
-
-            else
-               Current_Project_Path :=
-                 new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
-                             Prefix.all &
-                             ".." &  Directory_Separator &
-                             ".." & Directory_Separator &
-                             ".." & Directory_Separator & "gnat");
-            end if;
-
-            Free (Prefix);
-         end;
+      if Add_Default_Dir and Sdefault.Search_Dir_Prefix /= null then
+         Current_Project_Path :=
+           new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
+                         Sdefault.Search_Dir_Prefix.all);
       end if;
 
       if Current_Project_Path = null then