From 3dfe552131ed21d516263dae5efd89de29b17700 Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Sun, 15 Sep 2013 10:51:08 +0200 Subject: Finished adding alidir to the documentation. --- manual.en.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'manual.en.html') 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 Comfignat defines.

  • If your project file builds a library, then use a subdirectory of Comfignat.Stage_Includedir for Library_Src_Dir, Comfignat.Stage_Libdir for Library_Dir, and a - subdirectory of Comfignat.Stage_Libdir for + subdirectory of Comfignat.Stage_Alidir for Library_ALI_Dir.

  • @@ -159,8 +159,8 @@ project file without the ".gp" suffix. Make it import the project file that the preprocessor symbol Directories_GPR specifies, but only if Directories_GPR is defined. Do not import comfignat.gpr. Use the symbol Includedir in the value of -Source_Dirs, and use Libdir for Library_Dir -and as part of Library_ALI_Dir.

    +Source_Dirs, use Libdir for Library_Dir, and +use Alidir as part of Library_ALI_Dir.

  • Write a makefile that includes comfignat.mk. The makefile shall set the variable build_GPRs 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 & "/example"; for Library_Dir use Comfignat.Stage_Libdir; - for Library_ALI_Dir use Comfignat.Stage_Libdir & "/example"; + for Library_ALI_Dir use Comfignat.Stage_Alidir & "/example"; end Build_Example;

    example.gpr.gp
    @@ -200,7 +200,7 @@ library project Example is for Library_Kind use "dynamic"; for Source_Dirs use ($Includedir & "/example"); for Library_Dir use $Libdir; - for Library_ALI_Dir use $Libdir & "/example"; + for Library_ALI_Dir use $Alidir & "/example"; for Externally_Built use "true"; end Example;
    @@ -296,7 +296,7 @@ project files shall get the directory from the preprocessor symbol Alidir.

  • Other architecture-specific files shall usually be placed under a -separate subdirectory of stage_libdir. (It may be the same +separate subdirectory of stage_libdir. (It will be the same subdirectory that ALI files are placed in when alidir = libdir.) Programs shall look for them under Comfignat.Libdir.

  • @@ -372,13 +372,15 @@ Ada library information files. Bindir := "/usr/bin"; Libexecdir := "/usr/libexec"; Includedir := "/usr/include"; + Alidir := Libdir; end System_Directories;

    This directories project belongs in a multiarch operating system where libraries are kept in either /usr/lib or /usr/lib64 depending on which architecture they are compiled for. The directories project -sets Libdir to the right directory for the target architecture based +sets Libdir and Alidir +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 -- cgit v1.2.3