From b5b688b5f546b94b822e8fae88d384089880c7af Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 5 Jun 2018 15:19:16 -0500
Subject: [PATCH] Update `make doc`: don't copy broker docs

---
 CHANGES            | 4 ++++
 VERSION            | 2 +-
 doc/CMakeLists.txt | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index e928add3da..de7e57cc94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.5-647 | 2018-06-05 15:19:16 -0500
+
+  * Update `make doc`: don't copy broker docs (Corelight)
+
 2.5-646 | 2018-06-05 11:31:43 -0500
 
   * Add NCP::max_frame_size tuning option (Corelight)
diff --git a/VERSION b/VERSION
index a0572ad9b1..e4a6c3fab3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-646
+2.5-647
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2563375dcc..0edf2429ab 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,8 +4,6 @@ set(BROXYGEN_SCRIPT_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/broxygen_script_output)
 set(BROXYGEN_CACHE_DIR ${CMAKE_CURRENT_BINARY_DIR}/broxygen_cache)
 set(BROCCOLI_DOCS_SRC ${CMAKE_BINARY_DIR}/aux/broccoli/doc/html)
 set(BROCCOLI_DOCS_DST ${CMAKE_BINARY_DIR}/html/broccoli-api)
-set(BROKER_DOCS_SRC ${CMAKE_BINARY_DIR}/aux/broker/doc/html)
-set(BROKER_DOCS_DST ${CMAKE_BINARY_DIR}/html/broker-manual)
 
 # Find out what BROPATH to use when executing bro.
 execute_process(COMMAND ${CMAKE_BINARY_DIR}/bro-path-dev
@@ -63,9 +61,6 @@ add_custom_target(sphinxdoc
     COMMAND "${CMAKE_COMMAND}" -E create_symlink
             ${SPHINX_OUTPUT_DIR}/html
             ${CMAKE_BINARY_DIR}/html
-    # Copy Broker manual into output dir.
-    COMMAND rm -rf ${BROKER_DOCS_DST} &&
-            cp -r ${BROKER_DOCS_SRC} ${BROKER_DOCS_DST}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "[Sphinx] Generate HTML documentation in ${CMAKE_BINARY_DIR}/html")