h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-29 10:31:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix SYSCONFDIR and friends

Browse Source
This commit is contained in:
Fabian Boehm
2023-09-06 09:35:56 +02:00
parent 4f888d79ee
commit d6a6d77429
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Install.cmake
View File

@@ -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

8
cmake/Rust.cmake
View File

@@ -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