From 19eceff3bc2182af669d8df61bcecf3e74a9f895 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 22 Jun 2025 15:17:29 +0200 Subject: [PATCH] bulid.rs respect CARGO_TARGET_DIR in man output --- build.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index 4b15b3568..16ff07491 100644 --- a/build.rs +++ b/build.rs @@ -20,6 +20,10 @@ fn main() { // Add our default to enable tools that don't go through CMake, like "cargo test" and the // language server. + let cargo_target_dir: PathBuf = option_env!("CARGO_TARGET_DIR") + .map(canonicalize) + .unwrap_or(canonicalize(MANIFEST_DIR).join("target")); + // FISH_BUILD_DIR is set by CMake, if we are using it. // OUT_DIR is set by Cargo when the build script is running (not compiling) let default_build_dir = env::var("OUT_DIR").unwrap(); @@ -42,8 +46,7 @@ fn main() { std::env::set_var("FISH_BUILD_VERSION", version); - let cman = canonicalize(MANIFEST_DIR); - let targetman = cman.as_path().join("target").join("man"); + let targetman = cargo_target_dir.join("man"); #[cfg(feature = "embed-data")] #[cfg(not(clippy))]