aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-11-03 19:46:40 +0100
committerFlorian Walch <florian@fwalch.com>2014-11-03 19:46:40 +0100
commitcc7199f0e5ad6f03beb80eee81be8ca0f4ba2459 (patch)
treed963f020d84ce012b4e4ecad348d47b52c60b2d9
parent3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e (diff)
downloadrneovim-cc7199f0e5ad6f03beb80eee81be8ca0f4ba2459.tar.gz
rneovim-cc7199f0e5ad6f03beb80eee81be8ca0f4ba2459.tar.bz2
rneovim-cc7199f0e5ad6f03beb80eee81be8ca0f4ba2459.zip
CMake: Fix helptags generation.
-rw-r--r--cmake/GenerateHelptags.cmake2
-rw-r--r--cmake/InstallHelpers.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake
index 2e923ab45f..090cdf8ef4 100644
--- a/cmake/GenerateHelptags.cmake
+++ b/cmake/GenerateHelptags.cmake
@@ -1,4 +1,4 @@
-if(ENV{DESTDIR})
+if(DEFINED ENV{DESTDIR})
file(TO_CMAKE_PATH
"$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc"
HELPTAGS_WORKING_DIRECTORY)
diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake
index faf980bd47..a23bf63ab3 100644
--- a/cmake/InstallHelpers.cmake
+++ b/cmake/InstallHelpers.cmake
@@ -23,6 +23,7 @@ function(create_install_dir_with_perms)
install(CODE
"
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})