diff options
| -rw-r--r-- | comfignat.gpr.gp | 17 | ||||
| -rw-r--r-- | comfignat.mk | 13 |
2 files changed, 25 insertions, 5 deletions
diff --git a/comfignat.gpr.gp b/comfignat.gpr.gp index e334f00..6e5d7a8 100644 --- a/comfignat.gpr.gp +++ b/comfignat.gpr.gp @@ -151,6 +151,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; @@ -268,12 +275,18 @@ abstract project Comfignat is #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; diff --git a/comfignat.mk b/comfignat.mk index 23e71aa..7b3ccce 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -101,6 +101,7 @@ cachedir = ${localstatedir}/cache logdir = ${localstatedir}/log includedir = ${prefix}/include libdir = ${exec_prefix}/lib +alidir = ${libdir} gprdir = ${datarootdir}/gpr localedir = ${datarootdir}/locale mandir = ${datarootdir}/man @@ -150,6 +151,7 @@ stage_cachedir = ${stagedir}${cachedir} stage_logdir = ${stagedir}${logdir} stage_includedir = ${stagedir}${includedir} stage_libdir = ${stagedir}${libdir} +stage_alidir = ${stagedir}${alidir} stage_gprdir = ${stagedir}${gprdir} stage_localedir = ${stagedir}${localedir} stage_mandir = ${stagedir}${mandir} @@ -239,7 +241,7 @@ configuration_variables += \ dirgpr relocatable_package \ prefix exec_prefix datarootdir localstatedir \ bindir libexecdir datadir sysconfdir statedir cachedir logdir includedir \ - libdir gprdir localedir mandir infodir miscdocdir runtimedir lockdir \ + libdir alidir gprdir localedir mandir infodir miscdocdir runtimedir lockdir \ objdir stagedir \ install_cp_flags \ ${options} @@ -395,14 +397,17 @@ ifeq (${dirgpr},) all_directories += '-DLibexecdir="${call embed_pathname,${libexecdir}}"' all_directories += '-DIncludedir="${call embed_pathname,${includedir}}"' all_directories += '-DLibdir="${call embed_pathname,${libdir}}"' + all_directories += '-DAlidir="${call embed_pathname,${alidir}}"' all_directories += '-DStage_Bindir="${stage_bindir}"' all_directories += '-DStage_Libexecdir="${stage_libexecdir}"' all_directories += '-DStage_Includedir="${stage_includedir}"' all_directories += '-DStage_Libdir="${stage_libdir}"' + all_directories += '-DStage_Alidir="${stage_alidir}"' usage_directories = '-DIncludedir="${call usage_pathname,${includedir}}"' \ - '-DLibdir="${call usage_pathname,${libdir}}"' + '-DLibdir="${call usage_pathname,${libdir}}"' \ + '-DAlidir="${call usage_pathname,${alidir}}"' else @@ -417,10 +422,12 @@ else all_directories += '-DLibexecdir=${directories_project}.Libexecdir' all_directories += '-DIncludedir=${directories_project}.Includedir' all_directories += '-DLibdir=${directories_project}.Libdir' + all_directories += '-DAlidir=${directories_project}.Alidir' usage_directories = '-DDirectories_GPR="${dirgpr}"' \ '-DIncludedir=${directories_project}.Includedir' \ - '-DLibdir=${directories_project}.Libdir' + '-DLibdir=${directories_project}.Libdir' \ + '-DAlidir=${directories_project}.Alidir' endif |