From bd244c69f5edd6b84753a4bc6c2bd1ca011e90f7 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 21 Dec 2025 16:02:08 -0500
Subject: Tweak build setup

---
 .github/workflows/release.yml | 12 +++---------
 Makefile                      |  2 +-
 local-tomo                    |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d153774f..57bfc0e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,9 +27,7 @@ jobs:
 
       - name: Package
         run: |
-          mkdir -p tomo
-          cp tomo tomo/tomo
-          tar -czf tomo-linux-x86_64.tar.gz tomo
+          tar -czf tomo-linux-x86_64.tar.gz build/*
           sha256sum tomo-linux-x86_64.tar.gz > tomo-linux-x86_64.tar.gz.sha256
 
       - name: Upload
@@ -62,9 +60,7 @@ jobs:
 
       - name: Package
         run: |
-          mkdir -p tomo
-          cp tomo tomo/tomo
-          tar -czf tomo-linux-aarch64.tar.gz tomo
+          tar -czf tomo-linux-aarch64.tar.gz build/*
           sha256sum tomo-linux-aarch64.tar.gz > tomo-linux-aarch64.tar.gz.sha256
 
       - name: Upload
@@ -91,9 +87,7 @@ jobs:
 
       - name: Package
         run: |
-          mkdir -p tomo
-          cp tomo tomo/tomo
-          tar -czf tomo-macos-universal.tar.gz tomo
+          tar -czf tomo-macos-universal.tar.gz build/*
           shasum -a 256 tomo-macos-universal.tar.gz > tomo-macos-universal.tar.gz.sha256
 
       - name: Upload
diff --git a/Makefile b/Makefile
index 11b3282f..e7e689d0 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ API_MD=$(patsubst %.yaml,%.md,$(API_YAML))
 all: config.mk check-c-compiler check-libs build
 	@$(ECHO) "All done!"
 
-BUILD_DIR=build/$(TOMO_VERSION)
+BUILD_DIR=build/tomo@$(TOMO_VERSION)
 headers := $(wildcard src/stdlib/*.h)
 build_headers := $(patsubst src/stdlib/%.h, $(BUILD_DIR)/include/tomo@$(TOMO_VERSION)/%.h, $(headers))
 
diff --git a/local-tomo b/local-tomo
index d16e090e..2bab6e2b 100755
--- a/local-tomo
+++ b/local-tomo
@@ -1,6 +1,6 @@
 #!/bin/sh
 version=$(awk '/^## / {print $2; exit}' CHANGES.md)
-if ! [ -e ./build/$version/bin/tomo ]; then
+if ! [ -e ./build/tomo@$version/bin/tomo ]; then
     make -j
 fi
-exec ./build/$version/bin/tomo "$@"
+exec ./build/tomo@$version/bin/tomo "$@"
-- 
cgit v1.2.3