diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 6615e17fc..5499aeb37 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -40,6 +40,16 @@ set(extra_confdir "${datadir}/${rel_confdir}" CACHE STRING "Path for extra configuration") + +corrosion_set_env_vars(${fish_rust_target} + "PREFIX=${prefix}" + # Temporary hack to propogate CMake flags/options to build.rs. + "CMAKE_WITH_GETTEXT=${CMAKE_WITH_GETTEXT}" + "DOCDIR=${CMAKE_INSTALL_FULL_DOCDIR}" + "DATADIR=${CMAKE_INSTALL_FULL_DATADIR}" + "SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}" + "BINDIR=${CMAKE_INSTALL_FULL_BINDIR}" +) # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath. set(MANUALS ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish.1 ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish_indent.1 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake index cf6ae29bb..c87cd1917 100644 --- a/cmake/Rust.cmake +++ b/cmake/Rust.cmake @@ -67,10 +67,10 @@ corrosion_set_env_vars(${fish_rust_target} "PREFIX=${CMAKE_INSTALL_PREFIX}" # Temporary hack to propogate CMake flags/options to build.rs. "CMAKE_WITH_GETTEXT=${CMAKE_WITH_GETTEXT}" - "DOCDIR=${DOCDIR}" - "DATADIR=${DATADIR}" - "SYSCONFDIR=${SYSCONFDIR}" - "BINDIR=${BINDIR}" + "DOCDIR=${CMAKE_INSTALL_FULL_DOCDIR}" + "DATADIR=${CMAKE_INSTALL_FULL_DATADIR}" + "SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}" + "BINDIR=${CMAKE_INSTALL_FULL_BINDIR}" ) # this needs an extra fish-rust due to the poor source placement