From 2d7c9111628e973e3e1df827f1dd6974cff599fd Mon Sep 17 00:00:00 2001
From: Matthias Maier
Date: Mon, 11 Jul 2016 05:51:27 -0500
Subject: [PATCH] Documentation: Clarify RELDIR handling
---
doc/users/cmake.html | 17 ++++++++---------
doc/users/cmakelists.html | 8 ++++----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/doc/users/cmake.html b/doc/users/cmake.html
index 6ad040c450..43af69f047 100644
--- a/doc/users/cmake.html
+++ b/doc/users/cmake.html
@@ -921,7 +921,6 @@ ${CMAKE_INSTALL_PREFIX}/
lib${LIB_SUFFIX}
lib${LIB_SUFFIX}/cmake/deal.II
share/deal.II/
- share/deal.II/cmake/macros
./
doc
examples
@@ -933,14 +932,14 @@ ${CMAKE_INSTALL_PREFIX}/
The default directory structure can be changed by setting the
following variables:
-DEAL_II_EXECUTABLE_RELDIR
-DEAL_II_INCLUDE_RELDIR
-DEAL_II_LIBRARY_RELDIR
-DEAL_II_PROJECT_CONFIG_RELDIR
-DEAL_II_SHARE_RELDIR
-DEAL_II_DOCREADME_RELDIR
-DEAL_II_DOCHTML_RELDIR
-DEAL_II_EXAMPLES_RELDIR
+DEAL_II_EXECUTABLE_RELDIR default: bin
+DEAL_II_INCLUDE_RELDIR default: include
+DEAL_II_LIBRARY_RELDIR default: lib${LIB_SUFFIX}
+DEAL_II_PROJECT_CONFIG_RELDIR default: lib${LIB_SUFFIX}/cmake/deal.II
+DEAL_II_SHARE_RELDIR default: share/deal.II/
+DEAL_II_DOCREADME_RELDIR default: ./
+DEAL_II_DOCHTML_RELDIR default: doc
+DEAL_II_EXAMPLES_RELDIR default: examples
diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html
index ecc73de2a8..3bd4b58578 100644
--- a/doc/users/cmakelists.html
+++ b/doc/users/cmakelists.html
@@ -26,10 +26,10 @@
- Simple
CMakeLists.txt
- - Adding multiple executable targets
- - Adding libraries and common source files
- - Switching build types
- - Adding a "run" target
+ - Adding multiple executable targets
+ - Adding libraries and common source files
+ - Switching build types
+ - Adding a "run" target
- Advanced
CMakeLists.txt
--
2.39.5