summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Soller <jackpot51@gmail.com>2022-11-23 13:58:56 -0700
committerJeremy Soller <jackpot51@gmail.com>2022-11-23 13:58:56 -0700
commitc8634bd9890afdac4438d1ff99631d600d469264 (patch)
tree16bc13e19508840a6ba1a90df6d46d508512553c
parent8c0bd65974eadb02bcdcb140bc51b2a73cb2a957 (diff)
Fix ci-img0.8.0
-rw-r--r--mk/ci.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/ci.mk b/mk/ci.mk
index ff6bc6e..9d008b3 100644
--- a/mk/ci.mk
+++ b/mk/ci.mk
@@ -12,10 +12,10 @@ ci-img: FORCE
# The name of the target must match the name of the filesystem config file
desktop server demo: FORCE
- rm -f "$(BUILD)/harddrive.img" "$(BUILD)/livedisk.iso"
- $(MAKE) FILESYSTEM_CONFIG=config/$(ARCH)/$@.toml $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
- cp "$(BUILD)/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"
- cp "$(BUILD)/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"
+ rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso"
+ $(MAKE) FILESYSTEM_CONFIG=config/$(ARCH)/$@.toml build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso
+ cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"
+ cp "build/$(ARCH)/$@/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"
# CI packaging target
ci-pkg: prefix FORCE