You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2016/04/29 18:55:56 UTC

qpid-dispatch git commit: NO-JIRA - aconway's fix for duplicate directory creation issue in make doc

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 120593812 -> 4a23706ed


NO-JIRA - aconway's fix for duplicate directory creation issue in make doc


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4a23706e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4a23706e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4a23706e

Branch: refs/heads/master
Commit: 4a23706edd24163a1a7c17cf78529011ac0e7e1f
Parents: 1205938
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Fri Apr 29 12:55:41 2016 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Fri Apr 29 12:55:41 2016 -0400

----------------------------------------------------------------------
 doc/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4a23706e/doc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e6fcd52..c4cf2eb 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -80,7 +80,6 @@ if(BUILD_DOCS)
   file(GLOB_RECURSE PNG_SRC RELATIVE ${src} *.png)
   foreach(file ${PNG_SRC})
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src}/${file} ${bin})
-    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src}/${file} ${bin}/dochtml)
   endforeach()
 
   # Generate files from management schema
@@ -146,6 +145,11 @@ if(BUILD_DOCS)
     add_dependencies(doc doc-sphinx)
 
     install_doc(DIRECTORY ${bin}/dochtml/  DESTINATION ${QD_DOC_INSTALL_DIR}/html)
+
+    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+      ${bin}/html
+      ${bin}/singlehtml
+      ${bin}/dochtml)
   endif(USE_SPHINX)
 
   # Install rst documentation as baseline in case we have no generator


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org