mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
CMake: Fix helptags generation when prefix is not /usr. #2741
This commit is contained in:
parent
6609a545ad
commit
9995f15a98
@ -284,7 +284,9 @@ foreach(PROG ${RUNTIME_PROGRAMS})
|
|||||||
install_helper(PROGRAMS ${PROG} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/${BASEDIR})
|
install_helper(PROGRAMS ${PROG} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/${BASEDIR})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/GenerateHelptags.cmake)
|
configure_file(${PROJECT_SOURCE_DIR}/cmake/GenerateHelptags.cmake.in
|
||||||
|
${PROJECT_BINARY_DIR}/cmake/GenerateHelptags.cmake @ONLY)
|
||||||
|
install(SCRIPT ${PROJECT_BINARY_DIR}/cmake/GenerateHelptags.cmake)
|
||||||
|
|
||||||
|
|
||||||
# Go down the tree.
|
# Go down the tree.
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
if(DEFINED ENV{DESTDIR})
|
if(DEFINED ENV{DESTDIR})
|
||||||
file(TO_CMAKE_PATH
|
file(TO_CMAKE_PATH
|
||||||
$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc
|
$ENV{DESTDIR}/@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
|
||||||
HELPTAGS_WORKING_DIRECTORY)
|
HELPTAGS_WORKING_DIRECTORY)
|
||||||
else()
|
else()
|
||||||
file(TO_CMAKE_PATH
|
file(TO_CMAKE_PATH
|
||||||
${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc
|
@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
|
||||||
HELPTAGS_WORKING_DIRECTORY)
|
HELPTAGS_WORKING_DIRECTORY)
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
#include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h"
|
#include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h"
|
||||||
char *default_vim_dir = "${CMAKE_INSTALL_PREFIX}/share/nvim";
|
char *default_vim_dir = "${CMAKE_INSTALL_FULL_DATAROOTDIR}/nvim";
|
||||||
char *default_vimruntime_dir = "";
|
char *default_vimruntime_dir = "";
|
||||||
char_u *compiled_user = (char_u *)"${USERNAME}";
|
char_u *compiled_user = (char_u *)"${USERNAME}";
|
||||||
char_u *compiled_sys = (char_u *)"${HOSTNAME}";
|
char_u *compiled_sys = (char_u *)"${HOSTNAME}";
|
||||||
|
Loading…
Reference in New Issue
Block a user