From f4b3c51803cb6e0cb915e9e84129c6d9df3352cb Mon Sep 17 00:00:00 2001
From: Björn Persson
Date: Wed, 9 Oct 2013 17:19:42 +0200
Subject: Moved some paragraphs back.
---
INSTALL | 22 +++++++++++-----------
manual.en.html | 50 +++++++++++++++++++++++++-------------------------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/INSTALL b/INSTALL
index 9353fe4..5a45025 100644
--- a/INSTALL
+++ b/INSTALL
@@ -112,6 +112,15 @@ are relevant during the build:
logdir
The top-level directory for log files. Default: /log
+ includedir
+ The top-level directory for source files to be used in the compilation of
+ software using libraries, used only if no directories project is provided.
+ Default: /include
+
+ archincludedir
+ Like includedir but for architecture-specific source files, in case this
+ library must install such files. Default:
+
libdir
The directory for binary libraries to be used by other software, and the
top-level directory for other architecture-specific files, used for
@@ -123,15 +132,6 @@ are relevant during the build:
files for this library, used only if no directories project is provided.
Default:
- includedir
- The top-level directory for source files to be used in the compilation of
- software using libraries, used only if no directories project is provided.
- Default: /include
-
- archincludedir
- Like includedir but for architecture-specific source files, in case this
- library must install such files. Default: /include
-
gprdir
The directory for GNAT project files to be used in the building of software
using libraries. If you set this to a directory that GPRbuild and Gnatmake
@@ -192,10 +192,10 @@ invoke Gnatprep. You may need to define them if you run Gnatprep manually.
Statedir
Cachedir
Logdir
- Libdir
- Alidir
Includedir
Archincludedir
+ Libdir
+ Alidir
GPRdir
Localedir
Mandir
diff --git a/manual.en.html b/manual.en.html
index b27f463..d46954d 100755
--- a/manual.en.html
+++ b/manual.en.html
@@ -280,21 +280,6 @@ to create the subdirectory under stage_cachedir.
install log files but you may want to create a separate subdirectory under
stage_logdir if your program writes its own log files.
-Binary libraries shall be placed in Comfignat.Stage_Libdir
-by build project files. Usage project files shall get the directory from the
-preprocessor symbol Libdir.
-
-Ada library information (ALI) files shall be placed under a separate
-subdirectory of Comfignat.Stage_Alidir by build project files. Usage
-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 will be the same
-subdirectory that ALI files are placed in when
-alidir = libdir.) Programs shall look for them under
-Comfignat.Libdir.
-
Ada specifications, C headers and other source files that are needed for
compilation of other software that uses your libraries shall be placed under
Comfignat.Stage_Includedir by build project files, usually under a
@@ -310,6 +295,21 @@ put them under a separate subdirectory of stage_archincludedir.
Usage project files shall get the directory from the preprocessor symbol
Archincludedir.
+Binary libraries shall be placed in Comfignat.Stage_Libdir
+by build project files. Usage project files shall get the directory from the
+preprocessor symbol Libdir.
+
+Ada library information (ALI) files shall be placed under a separate
+subdirectory of Comfignat.Stage_Alidir by build project files. Usage
+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 will be the same
+subdirectory that ALI files are placed in when
+alidir = libdir.) Programs shall look for them under
+Comfignat.Libdir.
+
Comfignat puts usage project files in stage_gprdir.
Locale-specific message catalogs shall be placed in the appropriate
@@ -350,6 +350,16 @@ target architecture.
The top-level directory for programs that are intended to be run by other
programs rather than by users.
+Includedir
+The top-level directory for (normally architecture-independent) source
+files to be used in the compilation of software using libraries.
+
+Archincludedir
+The parent of libraries' separate library-specific directories for
+architecture-specific source files to be used in the compilation of software
+using libraries, for any libraries that absolutely must install such
+files.
+
Libdir
The directory for binary libraries to be used by other software, and the
top-level directory for other architecture-specific files.
@@ -359,16 +369,6 @@ top-level directory for other architecture-specific files.
Ada library information files.
-Includedir
-The top-level directory for architecture-independent source files to be
-used in the compilation of software using libraries.
-
-Archincludedir
-The parent of libraries' separate library-specific directories for
-architecture-specific source files to be used in the compilation of software
-using libraries, for any libraries that absolutely must install such
-files.
-
Here's an example of what a directories project may look like:
abstract project System_Directories is
--
cgit v1.2.3