diff options
| author | Florian Walch <florian@fwalch.com> | 2014-11-03 18:07:56 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-11-03 18:07:56 +0100 |
| commit | 3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e (patch) | |
| tree | a9ae5d772acc853e8f9da28a38a6452a59f4fabe | |
| parent | 6c0a596dacd7672e650847f1ed15e6a2a67b1483 (diff) | |
| download | rneovim-3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e.tar.gz rneovim-3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e.tar.bz2 rneovim-3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e.zip | |
Revert "Merge pull request #1381 from xzfc/master"
This reverts commit 6c0a596dacd7672e650847f1ed15e6a2a67b1483, reversing
changes made to 33d3a7c83b2f1d2cda22b53bf82d68267154cdfd.
| -rw-r--r-- | cmake/GenerateHelptags.cmake | 12 | ||||
| -rw-r--r-- | cmake/InstallHelpers.cmake | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake index 437832abc9..2e923ab45f 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(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..faf980bd47 100644 --- a/cmake/InstallHelpers.cmake +++ b/cmake/InstallHelpers.cmake @@ -22,7 +22,7 @@ function(create_install_dir_with_perms) install(CODE " - if(DEFINED ENV{DESTDIR}) + if(ENV{DESTDIR}) set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}) else() set(PREFIX \${CMAKE_INSTALL_PREFIX}) |