From cdaf2c662d058ac00c4381b56da2db900adacdcb Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Fri, 23 Jan 2015 14:38:56 +0100
Subject: [PATCH] Update documentation

---
 doc/users/cmakelists.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html
index bad55716c4..0a9869971a 100644
--- a/doc/users/cmakelists.html
+++ b/doc/users/cmakelists.html
@@ -47,6 +47,7 @@
     </li>
     <li><a href="#cmakeauto">Autopilot style <code>CMakeLists.txt</code></li>
     <li><a href="#dealiiconfig"><code>deal.IIConfig.cmake</code></a></li>
+    <li><a href="#makeconfig"><code>Make.global_options</code></a></li>
   </ol>
 </div>
 
@@ -717,6 +718,10 @@ DEAL_II_VERSION_MAJOR       - the major number, e.g. "8"
 DEAL_II_VERSION_MINOR       - the minor version number, e.g. "2"
 DEAL_II_VERSION_SUBMINOR    - the minor version number, e.g. "0"
 
+DEAL_II_GIT_BRANCH          - name of the local git branch of the source directory
+DEAL_II_GIT_REVISION        - full sha1 revision of the current git HEAD
+DEAL_II_GIT_SHORTREV        - short sha1 revision of the current git HEAD
+
 DEAL_II_BUILD_TYPE          - the configured build type, e.g. "DebugRelease"
 DEAL_II_BUILD_TYPES         - an all caps list of available configurations,
                               e.g. "DEBUG;RELEASE"
@@ -807,6 +812,18 @@ DEAL_II_WITH_UMFPACK
 DEAL_II_WITH_ZLIB
 </pre>
 
+<a name="makeconfig"></a>
+<h2>  <code>Make.global_options</code> </h2>
+
+<p>
+  Above CMake configuration file <code>deal.IIConfig.cmake</code> is also
+  available as a Makefile includable file called
+  <code>Make.global_options</code>. It resides under
+  <code>share/deal.II/Make.global_options</code> in the build and install
+  directory (or alternatively whichever relative path
+  <code>DEAL_II_SHARE_RELDIR</code> is set to).
+</p>
+
     <hr />
     <div class="right">
       <a href="http://validator.w3.org/check?uri=referer" target="_top">
-- 
2.39.5