diff --git a/distrib/gnatcoll.gpr__copy.in b/distrib/gnatcoll.gpr__copy.in
index 1ddb6cd..9813d12 100644
--- a/distrib/gnatcoll.gpr__copy.in
+++ b/distrib/gnatcoll.gpr__copy.in
@@ -25,10 +25,10 @@ project GnatColl is
So_Ext := "@SO_EXT@";
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 Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
for Library_Version use
"lib" & Project'Library_Name & So_Ext & "." & Version;
diff --git a/distrib/gnatcoll.gpr__gnat_util.in b/distrib/gnatcoll.gpr__gnat_util.in
index 3d4b3e4..610a45a 100644
--- a/distrib/gnatcoll.gpr__gnat_util.in
+++ b/distrib/gnatcoll.gpr__gnat_util.in
@@ -26,10 +26,10 @@ project GnatColl is
So_Ext := "@SO_EXT@";
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 Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
for Library_Version use
"lib" & Project'Library_Name & So_Ext & "." & Version;
diff --git a/distrib/gnatcoll_gmp.gpr.in b/distrib/gnatcoll_gmp.gpr.in
index 28b0c2d..e23f52f 100644
--- a/distrib/gnatcoll_gmp.gpr.in
+++ b/distrib/gnatcoll_gmp.gpr.in
@@ -1,12 +1,12 @@
with "gnatcoll";
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/";
for Library_Version use
"lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
diff --git a/distrib/gnatcoll_gtk.gpr b/distrib/gnatcoll_gtk.gpr
index 3402e4b..a2249a0 100644
--- a/distrib/gnatcoll_gtk.gpr
+++ b/distrib/gnatcoll_gtk.gpr
@@ -2,7 +2,7 @@ with "gnatcoll";
with "gtkada";
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";
diff --git a/distrib/gnatcoll_iconv.gpr b/distrib/gnatcoll_iconv.gpr
index a19cb91..bf8a67e 100644
--- a/distrib/gnatcoll_iconv.gpr
+++ b/distrib/gnatcoll_iconv.gpr
@@ -1,7 +1,7 @@
with "gnatcoll";
project GnatColl_Iconv is
for Library_Name use "gnatcoll_iconv";
- 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";
diff --git a/distrib/gnatcoll_postgres.gpr b/distrib/gnatcoll_postgres.gpr
index ea43c29..018df7e 100644
--- a/distrib/gnatcoll_postgres.gpr
+++ b/distrib/gnatcoll_postgres.gpr
@@ -1,7 +1,7 @@
with "gnatcoll";
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";
diff --git a/distrib/gnatcoll_python.gpr.in b/distrib/gnatcoll_python.gpr.in
index 2cf696a..6660c43 100644
--- a/distrib/gnatcoll_python.gpr.in
+++ b/distrib/gnatcoll_python.gpr.in
@@ -1,12 +1,12 @@
with "gnatcoll";
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.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/";
for Library_Version use
"lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
diff --git a/distrib/gnatcoll_readline.gpr b/distrib/gnatcoll_readline.gpr
index e193828..276280b 100644
--- a/distrib/gnatcoll_readline.gpr
+++ b/distrib/gnatcoll_readline.gpr
@@ -1,7 +1,7 @@
with "gnatcoll";
project GnatColl_Readline is
for Library_Name use "gnatcoll_readline";
- 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";
diff --git a/distrib/gnatcoll_sqlite.gpr b/distrib/gnatcoll_sqlite.gpr
index d9ba241..9dfc85a 100644
--- a/distrib/gnatcoll_sqlite.gpr
+++ b/distrib/gnatcoll_sqlite.gpr
@@ -1,7 +1,7 @@
with "gnatcoll";
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";
diff --git a/distrib/gnatcoll.gpr__copy.in b/distrib/gnatcoll.gpr__copy.in
index 9813d12..2164029 100644
--- a/distrib/gnatcoll.gpr__copy.in
+++ b/distrib/gnatcoll.gpr__copy.in
@@ -1,3 +1,4 @@
+with "directories";
-- This is the Gnatcoll project file. It can be used both for static and
-- relocatable libraries, although the two might not be available on
-- your system depending on how GnatColl was compiled and installed.
diff --git a/distrib/gnatcoll.gpr__gnat_util.in b/distrib/gnatcoll.gpr__gnat_util.in
index 610a45a..2e00c39 100644
--- a/distrib/gnatcoll.gpr__gnat_util.in
+++ b/distrib/gnatcoll.gpr__gnat_util.in
@@ -1,3 +1,4 @@
+with "directories";
-- This is the Gnatcoll project file. It can be used both for static and
-- relocatable libraries, although the two might not be available on
-- your system depending on how GnatColl was compiled and installed.
diff --git a/distrib/gnatcoll_gmp.gpr.in b/distrib/gnatcoll_gmp.gpr.in
index e23f52f..d2fb06f 100644
--- a/distrib/gnatcoll_gmp.gpr.in
+++ b/distrib/gnatcoll_gmp.gpr.in
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Gmp is
for Library_Name use "gnatcoll_gmp";
diff --git a/distrib/gnatcoll_gtk.gpr b/distrib/gnatcoll_gtk.gpr
index a2249a0..fbba945 100644
--- a/distrib/gnatcoll_gtk.gpr
+++ b/distrib/gnatcoll_gtk.gpr
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
with "gtkada";
project GnatColl_Gtk is
diff --git a/distrib/gnatcoll_iconv.gpr b/distrib/gnatcoll_iconv.gpr
index bf8a67e..b9df4b2 100644
--- a/distrib/gnatcoll_iconv.gpr
+++ b/distrib/gnatcoll_iconv.gpr
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Iconv is
for Library_Name use "gnatcoll_iconv";
diff --git a/distrib/gnatcoll_postgres.gpr b/distrib/gnatcoll_postgres.gpr
index 018df7e..3fd53e4 100644
--- a/distrib/gnatcoll_postgres.gpr
+++ b/distrib/gnatcoll_postgres.gpr
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Postgres is
for Library_Name use "gnatcoll_postgres";
diff --git a/distrib/gnatcoll_python.gpr.in b/distrib/gnatcoll_python.gpr.in
index 6660c43..e1931a8 100644
--- a/distrib/gnatcoll_python.gpr.in
+++ b/distrib/gnatcoll_python.gpr.in
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Python is
for Library_Name use "gnatcoll_python";
diff --git a/distrib/gnatcoll_readline.gpr b/distrib/gnatcoll_readline.gpr
index 276280b..57cb296 100644
--- a/distrib/gnatcoll_readline.gpr
+++ b/distrib/gnatcoll_readline.gpr
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Readline is
for Library_Name use "gnatcoll_readline";
diff --git a/distrib/gnatcoll_sqlite.gpr b/distrib/gnatcoll_sqlite.gpr
index 9dfc85a..ba83911 100644
--- a/distrib/gnatcoll_sqlite.gpr
+++ b/distrib/gnatcoll_sqlite.gpr
@@ -1,3 +1,4 @@
+with "directories";
with "gnatcoll";
project GnatColl_Sqlite is
for Library_Name use "gnatcoll_sqlite";
diff --git a/distrib/gnatcoll.gpr__copy.in b/distrib/gnatcoll.gpr__copy.in
index 2164029..aefb480 100644
--- a/distrib/gnatcoll.gpr__copy.in
+++ b/distrib/gnatcoll.gpr__copy.in
@@ -21,7 +21,7 @@ project GnatColl is
type Yes_No is ("yes", "no");
type Sqlite_Inclusion is ("yes", "no", "embedded");
- Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
+ Libdir := Directories.Libdir & "/gnatcoll/" & Gnatcoll_Kind;
So_Ext := "@SO_EXT@";
diff --git a/distrib/gnatcoll.gpr__gnat_util.in b/distrib/gnatcoll.gpr__gnat_util.in
index 2e00c39..add700d 100644
--- a/distrib/gnatcoll.gpr__gnat_util.in
+++ b/distrib/gnatcoll.gpr__gnat_util.in
@@ -22,7 +22,7 @@ project GnatColl is
type Yes_No is ("yes", "no");
type Sqlite_Inclusion is ("yes", "no", "embedded");
- Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
+ Libdir := Directories.Libdir & "/gnatcoll/" & Gnatcoll_Kind;
So_Ext := "@SO_EXT@";