From 1a61f95656f7e6030666384e36744facf1b5dcb3 Mon Sep 17 00:00:00 2001
From: jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Sat, 4 Feb 2012 14:19:38 +0000
Subject: [PATCH] - Add a comment how to improve the output of supported
 features later on. - Move docbook pdf installation to toplevel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40840 f5534014-38df-0310-8fa8-9805f1628bb7
---
 CMakeLists.txt         | 19 ++++++++++++++++++-
 docbook/CMakeLists.txt | 16 ----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 118fab5b22..c62709d637 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,6 +489,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h
 
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
+#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
 PRINT_ENABLED_FEATURES()
 PRINT_DISABLED_FEATURES()
 
@@ -615,7 +616,6 @@ set(TSHARK_TAP_SRC
 
 set(INSTALL_DIRS
 	diameter
-	docbook
 	dtds
 	help
 	radius
@@ -1056,3 +1056,20 @@ install(
 	PATTERN "Makefile.*" EXCLUDE
 	PATTERN "faq.py" EXCLUDE
 )
+
+message(STATUS "Debugging docdir install: ${DOC_DIR}")
+
+if(${DOC_DIR})
+	INSTALL(
+		DIRECTORY
+			${CMAKE_BINARY_DIR}/docbook/
+		DIRECTORY_PERMISSIONS
+			OWNER_EXECUTE OWNER_WRITE OWNER_READ
+			GROUP_EXECUTE GROUP_READ
+			WORLD_EXECUTE WORLD_READ
+		DESTINATION
+			${DOC_DIR}/guides
+#		PATTERN "*.pdf" 
+	)
+endif()
+
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 231a8483ff..10cf77cdb9 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -360,19 +360,3 @@ ADD_CUSTOM_COMMAND(
 		${WSLUA_MODULES}
 )
 
-message(STATUS "Debugging docdir install: ${DOC_DIR}")
-
-if(${DOC_DIR})
-	INSTALL(
-		DIRECTORY
-			${CMAKE_CURRENT_BINARY_DIR}
-		DIRECTORY_PERMISSIONS
-			OWNER_EXECUTE OWNER_WRITE OWNER_READ
-			GROUP_EXECUTE GROUP_READ
-			WORLD_EXECUTE WORLD_READ
-		DESTINATION
-			${DOC_DIR}/guides
-#		PATTERN "*.pdf" 
-	)
-endif()
-
-- 
2.34.1