From 62ede403f02c873177c9043718cecf3941f8a17e Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Mon, 3 Nov 2014 19:05:46 +0600 Subject: [PATCH 1/2] CMake: Fix checking of DESTDIR --- cmake/InstallHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) From 37be21fdee3eaadd10cd4048c5dc62a590af7217 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Mon, 3 Nov 2014 19:06:59 +0600 Subject: [PATCH 2/2] GenerateHelptags: Use ${PREFIX} variable --- cmake/GenerateHelptags.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 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}.")