From 59d62720ed2874a342b1c3fc4624d8a60cfc5fa4 Mon Sep 17 00:00:00 2001
From: Björn Persson <bjorn@rombobjörn.se>
Date: Mon, 4 Nov 2013 09:06:24 +0100
Subject: Made explicitly set directory variables override a directories
 project.

---
 INSTALL | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'INSTALL')

diff --git a/INSTALL b/INSTALL
index 982d5a7..4a33eb2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -55,7 +55,9 @@ are relevant during the build:
     GNAT project file that defines directory variables for use by other project
     files. Multiarch support requires a directories project that can refer to
     different directories depending on the target architecture. A directories
-    project overrides some but not all of the directory variables listed below.
+    project overrides the default values of some of the directory variables
+    listed below, but if one of those variables is set explicitly, then it
+    overrides the directories project.
 
  relocatable_package
     If relocatable_package is true and no directories project is provided, then
@@ -73,13 +75,13 @@ are relevant during the build:
     other architecture-specific files. Default: <prefix>
 
  bindir
-    The directory for programs that can be run from a command prompt, used only
-    if no directories project is provided. Default: <exec_prefix>/bin
+    The directory for programs that can be run from a command prompt; may be
+    provided by a directories project. Default: <exec_prefix>/bin
 
  libexecdir
     The top-level directory for programs that are intended to be run by other
-    programs rather than by users, used only if no directories project is
-    provided. Default: <exec_prefix>/libexec
+    programs rather than by users; may be provided by a directories project.
+    Default: <exec_prefix>/libexec
 
  datarootdir
     The root of the directory tree for read-only architecture-independent data
@@ -124,22 +126,22 @@ are relevant during the build:
 
  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.
+    software using libraries; may be provided by a directories project.
     Default: <prefix>/include
 
  archincludedir
     Like includedir but for architecture-specific source files, in case this
-    library must install such files. Default: <includedir>
+    library must install such files; may be provided by a directories project.
+    Default: <includedir>
 
  libdir
     The directory for binary libraries to be used by other software, and the
-    top-level directory for other architecture-specific files, used for
-    libraries only if no directories project is provided.
-    Default: <exec_prefix>/lib
+    top-level directory for other architecture-specific files; may be provided
+    by a directories project. Default: <exec_prefix>/lib
 
  alidir
     The parent of the library-specific directory for Ada library information
-    files for this library, used only if no directories project is provided.
+    files for this library; may be provided by a directories project.
     Default: <libdir>
 
  gprdir
-- 
cgit v1.2.3