doc: use ${DOC_OUTPUT_PATH} in the targets once we have it defined

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c1995f7..5a7d9cb 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -5,7 +5,7 @@ if(DOXYGEN_FOUND)
 
   add_custom_target(doc
     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
 
   add_custom_target(doc
     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile

-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    WORKING_DIRECTORY ${DOC_OUTPUT_PATH}

     COMMENT "Generating API documentation with Doxygen" VERBATIM
   )
 
     COMMENT "Generating API documentation with Doxygen" VERBATIM
   )
 

diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
index 0083f4a..17549bf 100644 (file)
--- a/doc/man/CMakeLists.txt
+++ b/doc/man/CMakeLists.txt
@@ -2,9 +2,9 @@
 find_package(Asciidoc)
 if(ASCIIDOC_FOUND)
   add_custom_target(manpages
 find_package(Asciidoc)
 if(ASCIIDOC_FOUND)
   add_custom_target(manpages

-    ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/am7xxx-play.1.txt -D ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/picoproj.1.txt -D ${CMAKE_CURRENT_BINARY_DIR}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/am7xxx-play.1.txt -D ${DOC_OUTPUT_PATH}/man
+    COMMAND ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/picoproj.1.txt -D ${DOC_OUTPUT_PATH}/man
+    WORKING_DIRECTORY ${DOC_OUTPUT_PATH}/man

     COMMENT "Generating man pages with Asciidoc" VERBATIM
   )
 
     COMMENT "Generating man pages with Asciidoc" VERBATIM
   )