diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-03 10:38:09 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-03 10:38:09 -0500 |
| commit | 6c0a596dacd7672e650847f1ed15e6a2a67b1483 (patch) | |
| tree | 78667fb2eee0c16365ab71441afa1a9c8b7e3f02 | |
| parent | 33d3a7c83b2f1d2cda22b53bf82d68267154cdfd (diff) | |
| parent | 37be21fdee3eaadd10cd4048c5dc62a590af7217 (diff) | |
| download | rneovim-6c0a596dacd7672e650847f1ed15e6a2a67b1483.tar.gz rneovim-6c0a596dacd7672e650847f1ed15e6a2a67b1483.tar.bz2 rneovim-6c0a596dacd7672e650847f1ed15e6a2a67b1483.zip | |
Merge pull request #1381 from xzfc/master
GenerateHelptags: Fix checking of DESTDIR
| -rw-r--r-- | cmake/GenerateHelptags.cmake | 12 | ||||
| -rw-r--r-- | cmake/InstallHelpers.cmake | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake index 2e923ab45f..437832abc9 100644 --- a/cmake/GenerateHelptags.cmake +++ b/cmake/GenerateHelptags.cmake @@ -1,12 +1,6 @@ -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() +file(TO_CMAKE_PATH + "${PREFIX}/share/nvim/runtime/doc" + HELPTAGS_WORKING_DIRECTORY) message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.") diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake index faf980bd47..bf1ef1c0d6 100644 --- a/cmake/InstallHelpers.cmake +++ b/cmake/InstallHelpers.cmake @@ -22,7 +22,7 @@ function(create_install_dir_with_perms) install(CODE " - if(ENV{DESTDIR}) + if(DEFINED ENV{DESTDIR}) set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}) else() set(PREFIX \${CMAKE_INSTALL_PREFIX}) |