--- a/distrib/gnatcoll_gmp.gpr.in	2011-08-17 17:11:54.633720247 +0400
+++ b/distrib/gnatcoll_gmp.gpr.in	2011-08-17 17:13:31.775720233 +0400
@@ -1,12 +1,13 @@
 with "gnatcoll";
+with "directories";
 project GnatColl_Gmp is
    for Library_Name use "gnatcoll_gmp";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Externally_Built use "true";
 
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl.GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
      "lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
 
--- a/distrib/gnatcoll.gpr__copy.in	2011-08-17 17:13:53.326720222 +0400
+++ b/distrib/gnatcoll.gpr__copy.in	2011-08-17 17:14:10.137720226 +0400
@@ -5,7 +5,7 @@
 --  variable LIBRARY_TYPE.
 --  The default depends on how gnatcoll was configured and compiled (although
 --  in general it will be static since this works better in most cases)
-
+with "directories":
 project GnatColl is
    Version := "@PACKAGE_VERSION@";
 
@@ -19,10 +19,10 @@
    type Yes_No is ("yes", "no");
 
    for Library_Name use "gnatcoll";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
       "lib" & Project'Library_Name & ".so." & Version;
 
--- a/distrib/gnatcoll.gpr__gnat_util.in	2011-08-17 17:14:21.560720224 +0400
+++ b/distrib/gnatcoll.gpr__gnat_util.in	2011-08-17 17:14:42.967720222 +0400
@@ -7,6 +7,7 @@
 --  in general it will be static since this works better in most cases)
 
 with "gnat_util";
+with "directories";
 
 project GnatColl is
    Version := "@PACKAGE_VERSION@";
@@ -21,10 +22,10 @@
    type Yes_No is ("yes", "no");
 
    for Library_Name use "gnatcoll";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
       "lib" & Project'Library_Name & ".so." & Version;
 
--- a/distrib/gnatcoll_gtk.gpr	2011-08-17 17:14:54.810720215 +0400
+++ b/distrib/gnatcoll_gtk.gpr	2011-08-17 17:15:08.558720225 +0400
@@ -1,13 +1,14 @@
 with "gnatcoll";
 with "gtkada";
+with "directories";
 project GnatColl_Gtk is
    for Library_Name use "gnatcoll_gtk";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Externally_Built use "true";
 
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl.GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
      "lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
 
--- a/distrib/gnatcoll_postgres.gpr	2011-08-17 17:16:27.123720206 +0400
+++ b/distrib/gnatcoll_postgres.gpr	2011-08-17 17:17:17.479720205 +0400
@@ -1,12 +1,13 @@
 with "gnatcoll";
+with "directories";
 project GnatColl_Postgres is
    for Library_Name use "gnatcoll_postgres";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Externally_Built use "true";
 
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl.GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
      "lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
 
--- a/distrib/gnatcoll_sqlite.gpr	2011-08-17 17:17:35.825720196 +0400
+++ b/distrib/gnatcoll_sqlite.gpr	2011-08-17 17:18:02.783720190 +0400
@@ -1,12 +1,13 @@
 with "gnatcoll";
+with "directories";
 project GnatColl_Sqlite is
    for Library_Name use "gnatcoll_sqlite";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Externally_Built use "true";
 
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl.GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
      "lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
 
--- a/distrib/gnatcoll_python.gpr.in	2011-08-17 17:18:54.009720185 +0400
+++ b/distrib/gnatcoll_python.gpr.in	2011-08-17 17:19:11.863720183 +0400
@@ -1,12 +1,13 @@
 with "gnatcoll";
+with "directories";
 project GnatColl_Python is
    for Library_Name use "gnatcoll_python";
-   for Source_Dirs use ("../../include/gnatcoll");
+   for Source_Dirs use (Directories.Includedir & "/gnatcoll");
    for Externally_Built use "true";
 
    for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
    for Library_Kind use GnatColl.GnatColl_Kind;
-   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
+   for Library_Dir  use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
    for Library_Version use
      "lib" & Project'Library_Name & ".so." & Gnatcoll.Version;