Rombobjörn

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL1
-rwxr-xr-xmanual.en.html16
2 files changed, 10 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index 9984671..5833d80 100644
--- a/INSTALL
+++ b/INSTALL
@@ -190,6 +190,7 @@ invoke Gnatprep. You may need to define them if you run Gnatprep manually.
Logdir
Includedir
Libdir
+ Alidir
GPRdir
Localedir
Mandir
diff --git a/manual.en.html b/manual.en.html
index a8a46a8..1a9e249 100755
--- a/manual.en.html
+++ b/manual.en.html
@@ -147,7 +147,7 @@ that the project <var>Comfignat</var> defines.</p>
<li><p>If your project file builds a library, then use a subdirectory of
<var>Comfignat.Stage_Includedir</var> for <var>Library_Src_Dir</var>,
<var>Comfignat.Stage_Libdir</var> for <var>Library_Dir</var>, and a
- subdirectory of <var>Comfignat.Stage_Libdir</var> for
+ subdirectory of <var>Comfignat.Stage_Alidir</var> for
<var>Library_ALI_Dir</var>.</p></li>
</ul>
</li>
@@ -159,8 +159,8 @@ project file without the "<samp>.gp</samp>" suffix. Make it import the project
file that the preprocessor symbol <var>Directories_GPR</var> specifies, but
only if <var>Directories_GPR</var> is defined. Do not import
<var>comfignat.gpr</var>. Use the symbol <var>Includedir</var> in the value of
-<var>Source_Dirs</var>, and use <var>Libdir</var> for <var>Library_Dir</var>
-and as part of <var>Library_ALI_Dir</var>.</p></li>
+<var>Source_Dirs</var>, use <var>Libdir</var> for <var>Library_Dir</var>, and
+use <var>Alidir</var> as part of <var>Library_ALI_Dir</var>.</p></li>
<li><p>Write a makefile that includes <var>comfignat.mk</var>. The makefile
shall set the variable <var>build_GPRs</var> to the filename of the
@@ -187,7 +187,7 @@ library project Build_Example is
for Object_Dir use Comfignat.Objdir;
for Library_Src_Dir use Comfignat.Stage_Includedir &amp; "/example";
for Library_Dir use Comfignat.Stage_Libdir;
- for Library_ALI_Dir use Comfignat.Stage_Libdir &amp; "/example";
+ for Library_ALI_Dir use Comfignat.Stage_Alidir &amp; "/example";
end Build_Example;</pre></div>
<div class="example file"><h5><code>example.gpr.gp</code></h5>
@@ -200,7 +200,7 @@ library project Example is
for Library_Kind use "dynamic";
for Source_Dirs use ($Includedir &amp; "/example");
for Library_Dir use $Libdir;
- for Library_ALI_Dir use $Libdir &amp; "/example";
+ for Library_ALI_Dir use $Alidir &amp; "/example";
for Externally_Built use "true";
end Example;</pre></div>
@@ -296,7 +296,7 @@ project files shall get the directory from the preprocessor symbol
<var>Alidir</var>.</p></li>
<li><p>Other architecture-specific files shall usually be placed under a
-separate subdirectory of <var>stage_libdir</var>. (It may be the same
+separate subdirectory of <var>stage_libdir</var>. (It will be the same
subdirectory that ALI files are placed in when
<var>alidir</var> = <var>libdir</var>.) Programs shall look for them under
<var>Comfignat.Libdir</var>.</p></li>
@@ -372,13 +372,15 @@ Ada library information files.</dd>
Bindir := "/usr/bin";
Libexecdir := "/usr/libexec";
Includedir := "/usr/include";
+ Alidir := Libdir;
end System_Directories;</pre>
<p>This directories project belongs in a multiarch operating system where
libraries are kept in either <var>/usr/lib</var> or <var>/usr/lib64</var>
depending on which architecture they are compiled for. The directories project
-sets <var>Libdir</var> to the right directory for the target architecture based
+sets <var>Libdir</var> and <var>Alidir</var>
+to the right directory for the target architecture based
on an environment variable. A library project that uses this directories
project will therefore automatically adapt to the current target architecture,
so that 32-bit and 64-bit instances of the library can be installed in parallel