From 42cd77a9ffa2c27b32b03c6ac35321b1172cc707 Mon Sep 17 00:00:00 2001
From: Toby Jaffey <toby@ringtailsoftware.co.uk>
Date: Thu, 11 Dec 2025 20:35:39 +0000
Subject: [PATCH] Cleanup paths

---
 apps/conio/Makefile          | 2 +-
 apps/fib/Makefile            | 2 +-
 apps/hello-asm/Makefile      | 2 +-
 apps/helloworld/Makefile     | 2 +-
 apps/lissajous/Makefile      | 2 +-
 apps/maze/Makefile           | 2 +-
 apps/memtest/Makefile        | 2 +-
 apps/rust-hello/Makefile     | 2 +-
 apps/self/Makefile           | 2 +-
 apps/sketch/Makefile         | 2 +-
 apps/zig-mandel/Makefile     | 2 +-
 apps/zigtris/Makefile        | 2 +-
 hosts/host-arduino/Makefile  | 2 +-
 hosts/host-mini/Makefile     | 2 +-
 hosts/host-parallel/Makefile | 2 +-
 hosts/host/Makefile          | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/conio/Makefile b/apps/conio/Makefile
index d01b418..49f15d9 100644
--- a/apps/conio/Makefile
+++ b/apps/conio/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 all: all_common
diff --git a/apps/fib/Makefile b/apps/fib/Makefile
index d01b418..49f15d9 100644
--- a/apps/fib/Makefile
+++ b/apps/fib/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 all: all_common
diff --git a/apps/hello-asm/Makefile b/apps/hello-asm/Makefile
index d710443..15e3181 100644
--- a/apps/hello-asm/Makefile
+++ b/apps/hello-asm/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=hello-asm
 SRCS=${PROJECT}.S
 all: all_common
diff --git a/apps/helloworld/Makefile b/apps/helloworld/Makefile
index d01b418..49f15d9 100644
--- a/apps/helloworld/Makefile
+++ b/apps/helloworld/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 all: all_common
diff --git a/apps/lissajous/Makefile b/apps/lissajous/Makefile
index d01b418..49f15d9 100644
--- a/apps/lissajous/Makefile
+++ b/apps/lissajous/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 all: all_common
diff --git a/apps/maze/Makefile b/apps/maze/Makefile
index 7b4f5a1..f0ff05b 100644
--- a/apps/maze/Makefile
+++ b/apps/maze/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 OPT=-O2
diff --git a/apps/memtest/Makefile b/apps/memtest/Makefile
index f5cce9c..864ec41 100644
--- a/apps/memtest/Makefile
+++ b/apps/memtest/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 
 HEAP_SIZE=$(shell echo "1024 * 1024 * 32" | bc)
diff --git a/apps/rust-hello/Makefile b/apps/rust-hello/Makefile
index e7e3f9d..174bf06 100644
--- a/apps/rust-hello/Makefile
+++ b/apps/rust-hello/Makefile
@@ -1,5 +1,5 @@
 PROJECT=rust-hello
-TOPDIR=../../
+TOPDIR=../..
 
 all:
 	cargo build -r --target riscv32im-unknown-none-elf && ${PREFIX}objcopy target/riscv32im-unknown-none-elf/release/${PROJECT} -O binary ${PROJECT}.bin
diff --git a/apps/self/Makefile b/apps/self/Makefile
index 7c6cf20..4f66329 100644
--- a/apps/self/Makefile
+++ b/apps/self/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S ${TOPDIR}/uvm32/uvm32.c
 CFLAGS=-DUVM32_MEMORY_SIZE=8192 -DCUSTOM_STDLIB_H=\"uvm32_target.h\" -I../../uvm32
diff --git a/apps/sketch/Makefile b/apps/sketch/Makefile
index d01b418..49f15d9 100644
--- a/apps/sketch/Makefile
+++ b/apps/sketch/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
 all: all_common
diff --git a/apps/zig-mandel/Makefile b/apps/zig-mandel/Makefile
index b76bd55..8379a1b 100644
--- a/apps/zig-mandel/Makefile
+++ b/apps/zig-mandel/Makefile
@@ -1,5 +1,5 @@
 PROJECT=mandel
-TOPDIR=../../
+TOPDIR=../..
 
 all:
 	@# zig's objcopy is broken, so use external tool
diff --git a/apps/zigtris/Makefile b/apps/zigtris/Makefile
index 93708f6..7c876f4 100644
--- a/apps/zigtris/Makefile
+++ b/apps/zigtris/Makefile
@@ -1,5 +1,5 @@
 PROJECT=zigtris
-TOPDIR=../../
+TOPDIR=../..
 
 all:
 	@# zig's objcopy is broken, so use external tool
diff --git a/hosts/host-arduino/Makefile b/hosts/host-arduino/Makefile
index 8012bc2..e3c9bf4 100644
--- a/hosts/host-arduino/Makefile
+++ b/hosts/host-arduino/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 
 # Auto-generate the Arduino example
 # Arduino cannot set -DUVM32_MEMORY_SIZE, so add a config file
diff --git a/hosts/host-mini/Makefile b/hosts/host-mini/Makefile
index ae8a889..fde8954 100644
--- a/hosts/host-mini/Makefile
+++ b/hosts/host-mini/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 
 all:
 	xxd -n mandel -i ${TOPDIR}/precompiled/mandel.bin | sed -e "s/unsigned char/const unsigned char/" > mandel.h
diff --git a/hosts/host-parallel/Makefile b/hosts/host-parallel/Makefile
index 78c7952..3348197 100644
--- a/hosts/host-parallel/Makefile
+++ b/hosts/host-parallel/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../
+TOPDIR = ../..
 all:
 	xxd -n fib -i ${TOPDIR}/precompiled/fib.bin | sed -e "s/unsigned char/const unsigned char/" > fib.h
 	gcc -Wall -DUVM32_MEMORY_SIZE=16386 -I${TOPDIR}/uvm32 -I${TOPDIR}/common -o host-parallel ${TOPDIR}/uvm32/uvm32.c host-parallel.c
diff --git a/hosts/host/Makefile b/hosts/host/Makefile
index 19331f2..6e86f9c 100644
--- a/hosts/host/Makefile
+++ b/hosts/host/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=../../
+TOPDIR=../..
 
 all:
 	gcc -Wall -Werror -pedantic -std=c99 -O2 -DUVM32_MEMORY_SIZE=65536 -I${TOPDIR}/uvm32 -I${TOPDIR}/common -o host ${TOPDIR}/uvm32/uvm32.c host.c