diff --git a/fedora-gnat-project-common.spec b/fedora-gnat-project-common.spec index 8e3b8a0..9595a6c 100644 --- a/fedora-gnat-project-common.spec +++ b/fedora-gnat-project-common.spec @@ -1,6 +1,6 @@ Name: fedora-gnat-project-common Version: 3.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Files shared by Ada libraries Summary(sv): Gemensamma filer för adabibliotek @@ -59,6 +59,9 @@ cp -p macros.gnat %{buildroot}%{rpmmacrodir}/ %changelog +* Wed Dec 2 2020 Pavel Zhukov - 3.14-3 +- Add flags for gprinstall into macros.gnat + * Mon Jul 27 2020 Fedora Release Engineering - 3.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/macros.gnat.in b/macros.gnat.in index c215aa0..49a889b 100644 --- a/macros.gnat.in +++ b/macros.gnat.in @@ -81,3 +81,13 @@ # Comfignat. It passes the standard parameters for the build tools, the # directories project and the installation pathnames to Make. A goal for Make # may be appended on the command line. + +%Gpr_install_flags -p --sources-subdir=%{buildroot}/%{_includedir}/%{name} \\\ + --project-subdir=%{buildroot}/%_GNAT_project_dir \\\ + --exec-subdir=%{buildroot}/%{_bindir} \\\ + --ali-subdir=%{buildroot}/%{_libdir}/%{name} \\\ + --lib-subdir=%{buildroot}/%{_libdir} \\\ + --link-lib-subdir=%{buildroot}/%{_libdir} + +# Gprinstall_flags contains standard path for package installation is Fedora +# It deprecates usage of directories in case if project uses gprinstall properly