109 lines
4.2 KiB
Diff
109 lines
4.2 KiB
Diff
--- a/distrib/xmlada_dom.gpr 2012-12-18 13:53:16.341334269 +0400
|
|
+++ b/distrib/xmlada_dom.gpr 2012-12-18 13:54:03.003919628 +0400
|
|
@@ -1,12 +1,14 @@
|
|
with "xmlada_shared";
|
|
with "xmlada_sax";
|
|
+with "directories";
|
|
project XmlAda_Dom is
|
|
for Library_Name use "xmlada_dom";
|
|
|
|
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
|
|
- for Source_Dirs use ("../../include/xmlada");
|
|
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
|
|
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
|
|
- for Library_Dir use Xmlada_Shared.Libdir;
|
|
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
|
|
+
|
|
for Library_Version use
|
|
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
|
|
for Externally_Built use "true";
|
|
--- a/distrib/xmlada_sax.gpr 2012-12-18 13:54:41.931409193 +0400
|
|
+++ b/distrib/xmlada_sax.gpr 2012-12-18 13:55:26.489972416 +0400
|
|
@@ -1,13 +1,15 @@
|
|
with "xmlada_shared";
|
|
with "xmlada_input";
|
|
+with "directories";
|
|
with "xmlada_unicode";
|
|
project XmlAda_Sax is
|
|
for Library_Name use "xmlada_sax";
|
|
|
|
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
|
|
- for Source_Dirs use ("../../include/xmlada");
|
|
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
|
|
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
|
|
for Library_Dir use Xmlada_Shared.Libdir;
|
|
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
|
|
for Library_Version use
|
|
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
|
|
for Externally_Built use "true";
|
|
--- a/distrib/xmlada_input.gpr 2012-12-18 13:55:33.300060354 +0400
|
|
+++ b/distrib/xmlada_input.gpr 2012-12-18 13:56:06.452480247 +0400
|
|
@@ -1,10 +1,11 @@
|
|
with "xmlada_shared";
|
|
+with "directories";
|
|
with "xmlada_unicode";
|
|
project XmlAda_Input is
|
|
for Library_Name use "xmlada_input_sources";
|
|
|
|
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
|
|
- for Source_Dirs use ("../../include/xmlada");
|
|
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
|
|
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
|
|
for Library_Dir use Xmlada_Shared.Libdir;
|
|
for Library_Version use
|
|
--- a/distrib/xmlada.gpr 2012-12-18 13:56:18.460632494 +0400
|
|
+++ b/distrib/xmlada.gpr 2012-12-18 13:56:26.696736255 +0400
|
|
@@ -5,6 +5,8 @@
|
|
|
|
with "xmlada_unicode", "xmlada_sax", "xmlada_input", "xmlada_dom";
|
|
with "xmlada_schema";
|
|
+with "directories";
|
|
+
|
|
|
|
project Xmlada is
|
|
for Source_Dirs use ();
|
|
--- a/distrib/xmlada_shared.gpr.in 2012-12-18 13:56:36.862864254 +0400
|
|
+++ b/distrib/xmlada_shared.gpr.in 2012-12-18 13:57:08.059259105 +0400
|
|
@@ -1,3 +1,5 @@
|
|
+with "directories";
|
|
+
|
|
project Xmlada_Shared is
|
|
for Source_Dirs use ();
|
|
Version := "@PACKAGE_VERSION@";
|
|
@@ -6,5 +8,5 @@
|
|
Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@");
|
|
|
|
-- Location for the dynamic library and ALI files
|
|
- Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind;
|
|
+ Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind;
|
|
end Xmlada_Shared;
|
|
--- a/distrib/xmlada_schema.gpr 2012-12-18 13:57:29.490530848 +0400
|
|
+++ b/distrib/xmlada_schema.gpr 2012-12-18 13:57:48.865776522 +0400
|
|
@@ -1,10 +1,11 @@
|
|
with "xmlada_shared";
|
|
+with "directories";
|
|
with "xmlada_dom";
|
|
project XmlAda_Schema is
|
|
for Library_Name use "xmlada_schema";
|
|
|
|
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
|
|
- for Source_Dirs use ("../../include/xmlada");
|
|
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
|
|
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
|
|
for Library_Dir use Xmlada_Shared.Libdir;
|
|
for Library_Version use
|
|
--- a/distrib/xmlada_unicode.gpr 2012-12-18 13:58:00.042917667 +0400
|
|
+++ b/distrib/xmlada_unicode.gpr 2012-12-18 13:58:17.724141757 +0400
|
|
@@ -1,9 +1,11 @@
|
|
with "xmlada_shared";
|
|
+with "directories";
|
|
+
|
|
project XmlAda_Unicode is
|
|
for Library_Name use "xmlada_unicode";
|
|
|
|
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
|
|
- for Source_Dirs use ("../../include/xmlada");
|
|
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
|
|
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
|
|
for Library_Dir use Xmlada_Shared.Libdir;
|
|
for Library_Version use
|