Revert "Merge pull request #1381 from xzfc/master"

This reverts commit 6c0a596dac, reversing
changes made to 33d3a7c83b.
This commit is contained in:
Florian Walch 2014-11-03 18:07:56 +01:00
parent 6c0a596dac
commit 3fa28d2ba5
2 changed files with 10 additions and 4 deletions

View File

@ -1,6 +1,12 @@
file(TO_CMAKE_PATH if(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}.")

View File

@ -22,7 +22,7 @@ function(create_install_dir_with_perms)
install(CODE install(CODE
" "
if(DEFINED ENV{DESTDIR}) if(ENV{DESTDIR})
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})