Fix compilation when target dir in not in sources dir

danpashin · Jun 24, 2024 · e4df5e7 · e4df5e7
1 parent 288f2f0
commit e4df5e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/twackup-cli/Makefile.toml b/twackup-cli/Makefile.toml
@@ -44,14 +44,15 @@ command = "ldid"
 args = ["-S", "${TWACKUP_FAT_BINARY}"]
 
 [tasks.create-deb]
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
     "--input-type", "dir",
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",

diff --git a/twackup-gui/Makefile.toml b/twackup-gui/Makefile.toml
@@ -57,14 +57,15 @@ mv -v Twackup.app.dSYM "${DEST_DIR}"
 
 [tasks.create-deb]
 private = true
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
     "--input-type", "dir",
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",

diff --git a/twackup/Makefile.toml b/twackup/Makefile.toml
@@ -70,14 +70,15 @@ command = "ldid"
 args = ["-S", "${TWACKUP_FAT_DYLIB}"]
 
 [tasks.create-deb]
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
     "--input-type", "dir",
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",