diff options
| author | Thomas Anderson <tanderson@caltech.edu> | 2015-05-25 04:04:10 -0700 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-06-09 01:12:08 -0400 |
| commit | 9995f15a98e8e1c75458a455b1a3ced8c155e634 (patch) | |
| tree | 02ad2fa7fb8dcefa851d7d4063cada74ca49ba5d | |
| parent | 6609a545ad2f56e83af3dde06e66da6c3b9a747a (diff) | |
| download | rneovim-9995f15a98e8e1c75458a455b1a3ced8c155e634.tar.gz rneovim-9995f15a98e8e1c75458a455b1a3ced8c155e634.tar.bz2 rneovim-9995f15a98e8e1c75458a455b1a3ced8c155e634.zip | |
CMake: Fix helptags generation when prefix is not /usr. #2741
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/GenerateHelptags.cmake.in (renamed from cmake/GenerateHelptags.cmake) | 4 | ||||
| -rw-r--r-- | config/pathdef.c.in | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2faf5f7393..19e6253853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,7 +284,9 @@ foreach(PROG ${RUNTIME_PROGRAMS}) install_helper(PROGRAMS ${PROG} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/${BASEDIR}) endforeach() -install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/GenerateHelptags.cmake) +configure_file(${PROJECT_SOURCE_DIR}/cmake/GenerateHelptags.cmake.in + ${PROJECT_BINARY_DIR}/cmake/GenerateHelptags.cmake @ONLY) +install(SCRIPT ${PROJECT_BINARY_DIR}/cmake/GenerateHelptags.cmake) # Go down the tree. diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake.in index bc50db2ca4..0df10d730e 100644 --- a/cmake/GenerateHelptags.cmake +++ b/cmake/GenerateHelptags.cmake.in @@ -1,10 +1,10 @@ if(DEFINED ENV{DESTDIR}) file(TO_CMAKE_PATH - $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc + $ENV{DESTDIR}/@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc HELPTAGS_WORKING_DIRECTORY) else() file(TO_CMAKE_PATH - ${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc + @CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc HELPTAGS_WORKING_DIRECTORY) endif() diff --git a/config/pathdef.c.in b/config/pathdef.c.in index faf4267ce8..4579fbe455 100644 --- a/config/pathdef.c.in +++ b/config/pathdef.c.in @@ -1,5 +1,5 @@ #include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h" -char *default_vim_dir = "${CMAKE_INSTALL_PREFIX}/share/nvim"; +char *default_vim_dir = "${CMAKE_INSTALL_FULL_DATAROOTDIR}/nvim"; char *default_vimruntime_dir = ""; char_u *compiled_user = (char_u *)"${USERNAME}"; char_u *compiled_sys = (char_u *)"${HOSTNAME}"; |