From c87ace69083f9730e0ff675048c0b29f227a6853 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 6 Nov 2020 19:28:37 +0100 Subject: automake and cmake: install COPYING, NEWS and AUTHORS in /share/doc/proj --- CMakeLists.txt | 4 ++++ Makefile.am | 2 ++ cmake/ProjInstallPath.cmake | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a75aa578..ee1444a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,3 +277,7 @@ add_subdirectory(cmake) if(BUILD_TESTING) add_subdirectory(test) endif() + +set(docfiles COPYING NEWS AUTHORS) +install(FILES ${docfiles} + DESTINATION "${DOCDIR}") diff --git a/Makefile.am b/Makefile.am index 8507afe9..4f78ff32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,8 @@ DIST_SUBDIRS = include src man data cmake test EXTRA_DIST = CMakeLists.txt CITATION README.md +dist_doc_DATA = COPYING NEWS AUTHORS + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = proj.pc diff --git a/cmake/ProjInstallPath.cmake b/cmake/ProjInstallPath.cmake index 4c63d658..b7f7b821 100644 --- a/cmake/ProjInstallPath.cmake +++ b/cmake/ProjInstallPath.cmake @@ -29,7 +29,7 @@ if(UNIX) set(DEFAULT_LIB_SUBDIR ${CMAKE_INSTALL_LIBDIR}) set(DEFAULT_DATA_SUBDIR ${CMAKE_INSTALL_DATAROOTDIR}/proj) set(DEFAULT_INCLUDE_SUBDIR ${CMAKE_INSTALL_INCLUDEDIR}) - set(DEFAULT_DOC_SUBDIR ${CMAKE_INSTALL_DOCDIR}) + set(DEFAULT_DOC_SUBDIR share/doc/${PROJECT_NAME_LOWER}) set(DEFAULT_CMAKE_SUBDIR ${CMAKE_INSTALL_LIBDIR}/cmake) else() # Common locations for Unix and Mac OS X -- cgit v1.2.3