diff --git a/CMakeLists.txt b/CMakeLists.txt index 04fddf55..7222365a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,6 +414,8 @@ include_directories( # For use in src/CMakeLists.txt set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}") +install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}") + add_subdirectory(lib) #add_subdirectory(lib/includes) add_subdirectory(third-party) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index d05c9461..8c65a536 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -122,6 +122,13 @@ set(APIDOCS nghttp2_version.rst ) +set(MAN_PAGES + nghttp.1 + nghttpd.1 + nghttpx.1 + h2load.1 +) + # Other .rst files from the source tree that need to be copied # XXX move them to sources/ and create .in files? set(RST_FILES @@ -168,10 +175,7 @@ set(EXTRA_DIST _themes/sphinx_rtd_theme/static/js/theme.js _themes/sphinx_rtd_theme/theme.conf _themes/sphinx_rtd_theme/versions.html - nghttp.1 - nghttpd.1 - nghttpx.1 - h2load.1 + ${MAN_PAGES} bash_completion/nghttp bash_completion/nghttpd bash_completion/nghttpx @@ -310,3 +314,9 @@ sphinxbuild(doctest "Testing of doctests in the sources finished, look at the" "results in ${BUILDDIR}/doctest/output.txt." ) + +foreach(_man_page IN LISTS MAN_PAGES) + install(FILES ${_man_page} + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + ) +endforeach() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d6af25c..d7e466c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -253,6 +253,6 @@ if(ENABLE_ASIO_LIB) install(TARGETS nghttp2_asio LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(FILES libnghttp2_asio.pc + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endif()