From 5fe4a5db4c8d6f79219c3cb8c00a04f7547fe74a Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Sat, 22 Feb 2020 20:37:53 -0800
Subject: [PATCH] fixed build

---
 Source/CPM22/Makefile | 14 +++++++++-----
 Source/HBIOS/Build.sh |  5 ++++-
 Source/ZSDOS/Makefile | 14 +++++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Source/CPM22/Makefile b/Source/CPM22/Makefile
index 2b1da28c..b1f37b0d 100644
--- a/Source/CPM22/Makefile
+++ b/Source/CPM22/Makefile
@@ -1,12 +1,16 @@
 SYSFILES = cpm_wbw.sys cpm_una.sys
+BINFILES = cpm_wbw.bin cpm_una.bin
 OBJECTS = CCP.bin BDOS.bin CCP22.bin BDOS22.bin OS2CCP.bin OS3BDOS.bin \
-	ccpb03.bin bdosb01.bin loader.bin $(SYSFILES)
+	ccpb03.bin bdosb01.bin loader.bin $(SYSFILES) $(BINFILES)
 OTHERS = *.hex
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
-cpm_wbw.sys: loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin
-	cat loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin > $@
+%.sys: %.bin loader.bin
+	cat loader.bin $*.bin > $@
 
-cpm_una.sys: loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin
-	cat loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin > $@
+cpm_una.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin
+	cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin > $@
+
+cpm_wbw.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin
+	cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin > $@
diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh
index 48f21bc4..c1b4a50f 100755
--- a/Source/HBIOS/Build.sh
+++ b/Source/HBIOS/Build.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# fail on any error
+set -e
+
 CPMCP=../../Tools/`uname`/cpmcp
 
 # positional arguments
@@ -99,7 +102,7 @@ fi
 echo "adding apps to $romdiskfile"
 for i in assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest ; do
 	f=$(../../Tools/unix/casefn.sh ../../Binary/Apps/$i.com)
-	if [ "$f" = "nofile" ] ; then
+	if [ -z "$f" ] ; then
 		echo " " $i "not found"
 	else
 		echo " " $f
diff --git a/Source/ZSDOS/Makefile b/Source/ZSDOS/Makefile
index 72cff2b3..4d7421ba 100644
--- a/Source/ZSDOS/Makefile
+++ b/Source/ZSDOS/Makefile
@@ -1,5 +1,6 @@
 SYSFILES = zsys_wbw.sys zsys_una.sys
-OBJECTS = $(SYSFILES)
+BINFILES =  zsys_wbw.bin zsys_una.bin
+OBJECTS = $(SYSFILES) $(BINFILES)
 OTHERS = zsdos.rel zsdos.err loader.bin
 TOOLS = ../../Tools
 CCP = ../ZCPR-DJ/zcpr.bin
@@ -12,9 +13,12 @@ zsdos.rel: zsdos.z80
 zsdos.bin: zsdos.rel
 	$(ZXCC) $(CPM)/LINK -$@=$<[LD800]
 
-zsys_wbw.sys: loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin
-	cat loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin > $@
+%.sys:	%.bin loader.bin
+	cat loader.bin $*.bin > $@
+
+zsys_wbw.bin: $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin
+	cat $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin > $@
 
-zsys_una.sys: loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_una.bin
-	cat loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_una.bin > $@
+zsys_una.bin: $(CCP) zsdos.bin ../CBIOS/cbios_una.bin
+	cat $(CCP) zsdos.bin ../CBIOS/cbios_una.bin > $@