kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1381 from xzfc/master

Browse Source 
GenerateHelptags: Fix checking of DESTDIR
This commit is contained in:
Justin M. Keyes 2014-11-03 10:38:09 -05:00
commit 6c0a596dac
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/GenerateHelptags.cmake
View File

@ -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}.")

2
cmake/InstallHelpers.cmake
View File

@ -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})