From 0fcc2762e5291dc1e98d6887084235eaaf0dab74 Mon Sep 17 00:00:00 2001
From: Björn Persson <bjorn@rombobjörn.se>
Date: Thu, 1 Aug 2013 18:30:33 +0200
Subject: documentation adjustments

---
 INSTALL      |  9 +++++----
 comfignat.mk | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index e1e95b2..93b4650 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,7 @@ Basic Installation
 The simplest way to build and install the software is:
 
  1: Go to the directory that contains this file and the makefiles, and run
-    "make" to build the library.
+    "make" to build the software.
 
  2: Run "make install" to copy the files to the default locations. You will
     probably need root privileges if you install to the default locations.
@@ -163,7 +163,6 @@ variables listed above, DESTDIR is effective in the installation step.
 The following preprocessor symbols are used when the project files are
 preprocessed. They are derived from the Make variables above when the makefiles
 invoke Gnatprep. You may need to define them if you run Gnatprep manually.
-The same defaults as above will be used if the symbols are undefined.
 
  Directories_GPR
     The filename of the directories project, if any; corresponding to dirgpr.
@@ -192,7 +191,8 @@ The same defaults as above will be used if the symbols are undefined.
  Miscdocdir
  Runtimedir
  Lockdir
-    These correspond to the like-named Make variables.
+    These correspond to the like-named Make variables. The same defaults as
+    above will be used if the symbols are undefined.
 
 
 Optional Features
@@ -218,7 +218,8 @@ options are passed to them:
     version of Gnatprep or a wrapper for example. Default: gnatprep
 
  GNAT_BUILDER
-    The command for invoking the builder, that is GPRbuild. Default: gprbuild
+    The command for invoking the builder, that is GPRbuild or Gnatmake.
+    Default: gprbuild
 
  GNATFLAGS
     A space-separated list with all of the optional parameters to be passed to
diff --git a/comfignat.mk b/comfignat.mk
index 5c5e62a..c9871c6 100644
--- a/comfignat.mk
+++ b/comfignat.mk
@@ -111,17 +111,17 @@ objdir   = ${builddir}/obj
 stagedir = ${builddir}/stage
 # builddir is the build directory, which may be separate from the source tree.
 # Intermediate files produced during the build are kept in objdir. Files to be
-# installed are written to stagedir, and then copied to their destination in
+# installed are written under stagedir, and then copied to their destination in
 # the installation step.
 
 # Containing makefiles should avoid modifying the directory variables. Users
 # should be able to rely on these defaults.
 
 install_cp_flags = ${if ${DESTDIR},--preserve=timestamps}
-# Timestamps are preserved when installation is done to a staging directory. 
+# Timestamps are preserved when installation is done to a staging directory.
 # This matters for files that aren't generated during the build but copied from
 # the source tree. Timestamps are not preserved when installation is done
-# directly to the target system, because that would change the timestamps of 
+# directly to the target system, because that would change the timestamps of
 # existing directories.
 
 
@@ -501,9 +501,9 @@ configure:: ${builddir}/Makefile
 # defined later in the containing makefile, but can be overridden on the
 # command line. A variable is considered previously configured if there is
 # another variable with "_is_configured" appended to its name and a value of
-# "true". Such a variable is also written for each configured variable. It is
-# therefore possible to delete a variable V from the configuration by running
-# "make configure V_is_configured=false".
+# "true". Such a variable is also written for each configured variable. As a
+# side effect of this it is possible to delete a variable V from the
+# configuration by running "make configure V_is_configured=false".
 
 ${builddir}/comfignat.gpr: comfignat.gpr.gp | ${builddir}
 	"${GNATPREP}" $< $@ -DInvoked_By_Makefile ${all_directories}
-- 
cgit v1.2.3