diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-03 14:23:31 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-03 14:23:31 -0500 |
| commit | c4e112e13bcdf7374c5a5a9e763f6eb0bf95b012 (patch) | |
| tree | d963f020d84ce012b4e4ecad348d47b52c60b2d9 | |
| parent | 6c0a596dacd7672e650847f1ed15e6a2a67b1483 (diff) | |
| parent | cc7199f0e5ad6f03beb80eee81be8ca0f4ba2459 (diff) | |
| download | rneovim-c4e112e13bcdf7374c5a5a9e763f6eb0bf95b012.tar.gz rneovim-c4e112e13bcdf7374c5a5a9e763f6eb0bf95b012.tar.bz2 rneovim-c4e112e13bcdf7374c5a5a9e763f6eb0bf95b012.zip | |
Merge pull request #1387 from fwalch/fix-installation
Fix installation.
| -rw-r--r-- | cmake/GenerateHelptags.cmake | 12 | ||||
| -rw-r--r-- | cmake/InstallHelpers.cmake | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake index 437832abc9..090cdf8ef4 100644 --- a/cmake/GenerateHelptags.cmake +++ b/cmake/GenerateHelptags.cmake @@ -1,6 +1,12 @@ -file(TO_CMAKE_PATH - "${PREFIX}/share/nvim/runtime/doc" - HELPTAGS_WORKING_DIRECTORY) +if(DEFINED ENV{DESTDIR}) + file(TO_CMAKE_PATH + "$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc" + HELPTAGS_WORKING_DIRECTORY) +else() + file(TO_CMAKE_PATH + "${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc" + HELPTAGS_WORKING_DIRECTORY) +endif() message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.") diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake index bf1ef1c0d6..a23bf63ab3 100644 --- a/cmake/InstallHelpers.cmake +++ b/cmake/InstallHelpers.cmake @@ -22,7 +22,8 @@ function(create_install_dir_with_perms) install(CODE " - if(DEFINED ENV{DESTDIR}) + if(ENV{DESTDIR}) + # TODO(fwalch): Is this branch ever taken (#1381, #1387)? set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}) else() set(PREFIX \${CMAKE_INSTALL_PREFIX}) |