From 1ad90b389ffb426a21e4a4d64f614f62ae72a443 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@digerati.co.nz>
Date: Tue, 23 Apr 2024 08:58:32 +1200
Subject: [PATCH] Create assets dir relative to OUT_DIR

---
 .github/workflows/deploy.yml |  1 +
 .gitignore                   |  1 -
 Cargo.toml                   |  2 +-
 build.rs                     | 10 ++++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c1dfd28d..ad1fbc86 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -90,6 +90,7 @@ jobs:
         run: |
           mkdir -p "target/${{ matrix.target }}/release"
           mv target/oxipng "target/${{ matrix.target }}/release"
+          mv target/debug/assets "target/${{ matrix.target }}/release"
           cargo install --locked cargo-deb
           cargo deb --target "${{ matrix.target }}" --no-build --no-strip
 
diff --git a/.gitignore b/.gitignore
index 868a47a4..c03f402b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ target
 *.out.png
 /.idea
 /node_modules
-/generated
diff --git a/Cargo.toml b/Cargo.toml
index 7a218a72..d2a3cb09 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ panic = "abort"
 [package.metadata.deb]
 assets = [
     ["target/release/oxipng", "usr/bin/", "755"],
-    ["generated/assets/oxipng.1", "usr/share/man/man1/", "644"],
+    ["target/release/assets/oxipng.1", "usr/share/man/man1/", "644"],
     ["README.md", "usr/share/doc/oxipng/", "644"],
     ["CHANGELOG.md", "usr/share/doc/oxipng/", "644"],
 ]
diff --git a/build.rs b/build.rs
index 91cd1b6d..12b545b1 100644
--- a/build.rs
+++ b/build.rs
@@ -24,8 +24,14 @@ fn main() -> Result<(), Error> {
     println!("cargo:rerun-if-changed=src/cli.rs");
     println!("cargo:rerun-if-changed=src/display_chunks.rs");
 
-    // Create `generated/assets/` folder.
-    let path = env::current_dir()?.join("generated").join("assets");
+    // Create `target/<debug|release>/assets/` folder.
+    let outdir = match env::var_os("OUT_DIR") {
+        None => return Ok(()),
+        Some(outdir) => outdir,
+    };
+    let out_path = PathBuf::from(outdir);
+    let mut path = out_path.ancestors().nth(3).unwrap().to_owned();
+    path.push("assets");
     std::fs::create_dir_all(&path).unwrap();
 
     build_manpages(&path)?;