[PragmARC: 3/3] · Switched from common.gpr to directories.gpr. · Replaced PragmARC_Build_Target with DESTDIR.

[Björn Persson]

commit a23f4207d42d5add389a3a1856bdc7238e6b19b1
Author: Björn Persson <bjorn at rombobjörn.se>
Date:   Sat Feb 19 21:08:15 2011 +0100

    · Switched from common.gpr to directories.gpr.
    · Replaced PragmARC_Build_Target with DESTDIR.

 PragmARC.spec      |   11 +++++++----
 build_pragmarc.gpr |   16 ++++++++--------
 pragmarc.gpr       |   10 +++++-----
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/PragmARC.spec b/PragmARC.spec
index 4642240..78486a7 100644
--- a/PragmARC.spec
+++ b/PragmARC.spec
@@ -1,6 +1,6 @@
 Name:           PragmARC
 Version:        20060427
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        PragmAda Reusable Components, a component library for Ada
 Summary(sv):    PragmAda Reusable Components, ett komponentbibliotek för ada
 
@@ -12,7 +12,7 @@ Source2:        build_pragmarc.gpr
 Source3:        pragmarc.gpr
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gnat fedora-gnat-project-common dos2unix chrpath
+BuildRequires:  gcc-gnat fedora-gnat-project-common >= 2 dos2unix chrpath
 
 %description
 The PragmAda Reusable Components (PragmARCs) is a library of containers,
@@ -29,7 +29,7 @@ Summary:        Development files for %{name}
 Summary(sv):    Filer för programmering med %{name}
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       fedora-gnat-project-common
+Requires:       fedora-gnat-project-common >= 2
 
 %description    devel
 The %{name}-devel package contains source code and linking information for
@@ -54,7 +54,7 @@ mkdir %{_arch}
 # Delete files that won't be used.
 rm compile_all.adb assertion_handler.adb
 # Compile the library.
-gnatmake -P pragmarc.gpr %{GNAT_optflags} -XPragmARC_Build_Target=build_target
+gnatmake -P pragmarc.gpr %{GNAT_optflags} -XDESTDIR=build_target
 # Remove the unnecessary runpath that Gnatmake added.
 chrpath --delete build_target%{_libdir}/libpragmarc.so.%{version}
 # Convert line breaks.
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 19 2011 Björn Persson <bjorn at rombobjörn.se> - 20060427-10
+- Switched from common.gpr to directories.gpr.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20060427-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/build_pragmarc.gpr b/build_pragmarc.gpr
index f93c41e..fa0b28f 100644
--- a/build_pragmarc.gpr
+++ b/build_pragmarc.gpr
@@ -1,27 +1,27 @@
 -- This project file works together with the RPM spec file to compile the
 -- PragmARCs into an RPM package.
--- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se
+-- Copyright 2009 - 2011 B. Persson, Bjorn at Rombobeorn.se
 --
 -- This is free software; you can redistribute it and/or modify it under
 -- terms of the GNU General Public License as published by the Free Software
 -- Foundation; either version 2, or (at your option) any later version.
 
-with "common";
+with "directories";
 project PragmARC is
 
-   Version      := external("RPM_PACKAGE_VERSION");
-   Build_Target := external("PragmARC_Build_Target");
+   Version := external("RPM_PACKAGE_VERSION");
+   Destdir := external("DESTDIR");
 
    for Library_Name    use "pragmarc";
    for Library_Kind    use "relocatable";
    for Library_Version use "libpragmarc.so." & Version;
-   for Library_Src_Dir use Build_Target & "/usr/include/pragmarc";
-   for Library_Dir     use Build_Target & "/usr/" & Common.Lib;
-   for Library_ALI_Dir use Build_Target & "/usr/" & Common.Lib & "/pragmarc";
+   for Library_Src_Dir use Destdir & Directories.Incdir & "/pragmarc";
+   for Library_Dir     use Destdir & Directories.Libdir;
+   for Library_ALI_Dir use Destdir & Directories.Libdir & "/pragmarc";
 
    -- Put the binder files for different architectures in subdirectories where
    -- they won't conflict with each other.
-   for Object_Dir use Common.HARDWARE_PLATFORM;
+   for Object_Dir use Directories.Hardware_Platform;
 
    for Library_Interface use
            ("PragmARC",
diff --git a/pragmarc.gpr b/pragmarc.gpr
index 455abd4..049a1f0 100644
--- a/pragmarc.gpr
+++ b/pragmarc.gpr
@@ -1,15 +1,15 @@
 -- Projects that use the PragmAda Reusable Components should import this file.
--- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se
+-- Copyright 2009 - 2011 B. Persson, Bjorn at Rombobeorn.se
 --
 -- This is free software; you can redistribute it and/or modify it under
 -- terms of the GNU General Public License as published by the Free Software
 -- Foundation; either version 2, or (at your option) any later version.
 
-with "common";
+with "directories";
 project PragmARC is
    for Library_Name use "pragmarc";
-   for Source_Dirs use ("/usr/include/pragmarc");
-   for Library_Dir use "/usr/" & Common.Lib;
-   for Library_ALI_Dir use "/usr/" & Common.Lib & "/pragmarc";
+   for Source_Dirs use (Directories.Incdir & "/pragmarc");
+   for Library_Dir use Directories.Libdir;
+   for Library_ALI_Dir use Directories.Libdir & "/pragmarc";
    for Externally_Built use "true";
 end PragmARC;