From 705f8f414783f5e82a4f909fc456662cabb5feb0 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sun, 17 Jan 2016 13:02:42 -0800 Subject: cmake: Fix installation directories for man pages We're not (yet) using the GnuInstallDirs module, so we don't have things like CMAKE_INSTALL_MANDIR and such defined. (bzr r14606) --- CMakeLists.txt | 9 +-------- CMakeScripts/Pod2man.cmake | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa372021e..fdbb5cb60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,16 +181,9 @@ if(UNIX) install( FILES ${CMAKE_BINARY_DIR}/inkscape.desktop - DESTINATION ${SHARE_INSTALL}/applications + DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications ) - if(POD2MAN) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/inkscape.1 - DESTINATION ${SHARE_INSTALL}/man/man1 - ) - endif() - # this should probably be done no matter what the platform is, just set SHARE_INSTALL first add_subdirectory(share) diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake index 839e79d80..3189192de 100644 --- a/CMakeScripts/Pod2man.cmake +++ b/CMakeScripts/Pod2man.cmake @@ -48,7 +48,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) ) install( FILES ${MANFILE_FULL} - DESTINATION ${CMAKE_INSTALL_MANDIR}/man${SECTION} + DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION} ) endif() endmacro(pod2man PODFILE NAME SECTION CENTER) -- cgit v1.2.3