From 2aee9306591a7c8650348708efa4cddd0cc0b762 Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Wed, 10 Jan 2024 17:21:05 +0100 Subject: [PATCH] Revert "Remove redundantly set corrosion env vars." This reverts commit 114ebe3b8f3c63726d4be9e3d8ad82621152289c. --- cmake/Install.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 7b1a2b188..0947b802b 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -41,6 +41,15 @@ set(extra_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