Merge pull request #2318 from ideal/master

fix typo; change installation path of man and doc
This commit is contained in:
Max Lv
2019-03-11 15:32:25 +08:00
committed by GitHub
2 changed files with 9 additions and 3 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ option(WITH_EMBEDDED_SRC "build with embedded libcork, libipset, and libbloom so
# Will set GIT_EXECUTABLE and GIT_FOUND
# find_package(Git)
# When choose to not use embedded libcork, libipset and libboom, use libs shipped by system
# When choose to not use embedded libcork, libipset and libbloom, use libs shipped by system
if (NOT WITH_EMBEDDED_SRC)
set(USE_SYSTEM_SHARED_LIB TRUE)
endif ()
+8 -2
View File
@@ -69,13 +69,19 @@ if (NOT WITH_DOC_MAN)
set_target_properties(doc-man PROPERTIES EXCLUDE_FROM_ALL TRUE)
else ()
install(DIRECTORY ${CMAKE_BINARY_DIR}/man/
DESTINATION man)
DESTINATION share/man/man1
FILES_MATCHING PATTERN "*.1"
)
install(DIRECTORY ${CMAKE_BINARY_DIR}/man/
DESTINATION share/man/man8
FILES_MATCHING PATTERN "*.8"
)
endif ()
if (NOT WITH_DOC_HTML)
set_target_properties(doc-html PROPERTIES EXCLUDE_FROM_ALL TRUE)
else ()
install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
DESTINATION doc/html)
DESTINATION share/doc/${PROJECT_NAME})
endif ()
# This is required for custom command