1
# DP: - Change the default search path for project files to the one specified
2
# DP: by the Debian Policy for Ada: /usr/share/ada/adainclude.
4
Index: b/src/gcc/ada/Make-generated.in
5
===================================================================
6
--- a/src/gcc/ada/Make-generated.in
7
+++ b/src/gcc/ada/Make-generated.in
9
$(ECHO) " S1 : constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb
10
$(ECHO) " S2 : constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb
11
$(ECHO) " S3 : constant String := \"$(target_noncanonical)/\";" >>tmp-sdefault.adb
12
- $(ECHO) " S4 : constant String := \"$(libsubdir)/\";" >>tmp-sdefault.adb
13
+ $(ECHO) " S4 : constant String := \"/usr/share/ada/adainclude/\";" >>tmp-sdefault.adb
14
$(ECHO) " function Include_Dir_Default_Name return String_Ptr is" >>tmp-sdefault.adb
15
$(ECHO) " begin" >>tmp-sdefault.adb
16
$(ECHO) " return Relocate_Path (S0, S1);" >>tmp-sdefault.adb
17
Index: b/src/gcc/ada/prj-env.adb
18
===================================================================
19
--- a/src/gcc/ada/prj-env.adb
20
+++ b/src/gcc/ada/prj-env.adb
25
-with Makeutl; use Makeutl;
27
with Osint; use Osint;
28
with Output; use Output;
30
(Self : in out Project_Search_Path;
33
+ pragma Unreferenced (Target_Name);
34
Add_Default_Dir : Boolean := True;
37
@@ -2018,59 +2018,10 @@
39
-- Set the initial value of Current_Project_Path
41
- if Add_Default_Dir then
43
- Prefix : String_Ptr;
46
- if Sdefault.Search_Dir_Prefix = null then
50
- Prefix := new String'(Executable_Prefix_Path);
53
- Prefix := new String'(Sdefault.Search_Dir_Prefix.all
54
- & ".." & Dir_Separator
55
- & ".." & Dir_Separator
56
- & ".." & Dir_Separator
57
- & ".." & Dir_Separator);
60
- if Prefix.all /= "" then
61
- if Target_Name /= "" then
63
- -- $prefix/$target/lib/gnat
65
- Add_Str_To_Name_Buffer
66
- (Path_Separator & Prefix.all & Target_Name);
68
- -- Note: Target_Name has a trailing / when it comes from
71
- if Name_Buffer (Name_Len) /= '/' then
72
- Add_Char_To_Name_Buffer (Directory_Separator);
75
- Add_Str_To_Name_Buffer
76
- ("lib" & Directory_Separator & "gnat");
79
- -- $prefix/share/gpr
81
- Add_Str_To_Name_Buffer
82
- (Path_Separator & Prefix.all &
83
- "share" & Directory_Separator & "gpr");
87
- Add_Str_To_Name_Buffer
88
- (Path_Separator & Prefix.all &
89
- "lib" & Directory_Separator & "gnat");
94
+ if Add_Default_Dir and Sdefault.Search_Dir_Prefix /= null then
96
+ new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
97
+ Sdefault.Search_Dir_Prefix.all);
100
Self.Path := new String'(Name_Buffer (1 .. Name_Len));