mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 17:54:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1387 from fwalch/fix-installation

Browse Source 
Fix installation.
This commit is contained in:
Justin M. Keyes
2014-11-03 14:23:31 -05:00
parent 6c0a596dac cc7199f0e5
commit c4e112e13b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/GenerateHelptags.cmake
View File

@@ -1,6 +1,12 @@
file(TO_CMAKE_PATH if(DEFINED ENV{DESTDIR})
"${PREFIX}/share/nvim/runtime/doc" file(TO_CMAKE_PATH
HELPTAGS_WORKING_DIRECTORY) "$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}.") message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.")

3
cmake/InstallHelpers.cmake
View File

@@ -22,7 +22,8 @@ function(create_install_dir_with_perms)
install(CODE install(CODE
" "
if(DEFINED ENV{DESTDIR}) if(ENV{DESTDIR})
# TODO(fwalch): Is this branch ever taken (#1381, #1387)?
set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}) set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX})
else() else()
set(PREFIX \${CMAKE_INSTALL_PREFIX}) set(PREFIX \${CMAKE_INSTALL_PREFIX})