1 files changed, 33 insertions, 2 deletions

diff --git a/comfignat.gpr.gp b/comfignat.gpr.gp
index 1ba4337..22fab2d 100644
--- a/comfignat.gpr.gp
+++ b/comfignat.gpr.gp
@@ -144,6 +144,15 @@ abstract project Comfignat is
       Includedir := Prefix & "/include";
    #end if;
 
+   -- If a library has installed architecture-specific source files to be used
+   -- in compilation, then those files may also be under a library-specific
+   -- subdirectory of Archincludedir.
+   #if Archincludedir'Defined then
+      Archincludedir := $Archincludedir;
+   #else
+      Archincludedir := Includedir;
+   #end if;
+
    -- Binary libraries and other architecture-specific files are under Libdir.
    #if Libdir'Defined then
       Libdir := $Libdir;
@@ -151,6 +160,13 @@ abstract project Comfignat is
       Libdir := Exec_Prefix & "/lib";
    #end if;
 
+   -- ALI files are under a library-specific subdirectory of Alidir.
+   #if Alidir'Defined then
+      Alidir := $Alidir;
+   #else
+      Alidir := Libdir;
+   #end if;
+
    -- GNAT project files are under GPRdir.
    #if GPRdir'Defined then
       GPRdir := $GPRdir;
@@ -267,13 +283,28 @@ abstract project Comfignat is
       Stage_Includedir := Stagedir & Includedir;
    #end if;
 
+   -- If architecture-specific source files absolutely must be installed, then
+   -- those files may be placed under a library-specific subdirectory of
+   -- Stage_Archincludedir.
+   #if Stage_Archincludedir'Defined then
+      Stage_Archincludedir := $Stage_Archincludedir;
+   #else
+      Stage_Archincludedir := Stagedir & Archincludedir;
+   #end if;
+
    -- Binary libraries shall be installed in Stage_Libdir.
-   -- ALI files shall be installed in a library-specific subdirectory of
-   -- Stage_Libdir.
    #if Stage_Libdir'Defined then
       Stage_Libdir := $Stage_Libdir;
    #else
       Stage_Libdir := Stagedir & Libdir;
    #end if;
 
+   -- ALI files shall be installed under a library-specific subdirectory of
+   -- Stage_Alidir.
+   #if Stage_Alidir'Defined then
+      Stage_Alidir := $Stage_Alidir;
+   #else
+      Stage_Alidir := Stagedir & Alidir;
+   #end if;
+
 end Comfignat;