4 files changed, 54 insertions, 53 deletions
diff --git a/emulators/z80pack/files/patch-Makefile b/emulators/z80pack/files/patch-Makefile
new file mode 100644
index 000000000000..bc337c955163
--- /dev/null
+++ b/emulators/z80pack/files/patch-Makefile
@@ -0,0 +1,30 @@
+--- Makefile.orig	2024-06-01 14:02:02 UTC
++++ Makefile
+@@ -1,6 +1,6 @@ PACKAGE = z80pack
+ PACKAGE = z80pack
+-PREFIX = $(HOME)
+-#PREFIX = /usr/local
++#PREFIX = $(HOME)
++PREFIX = /usr/local
+ EXEC_PREFIX = $(PREFIX)
+ BINDIR = $(EXEC_PREFIX)/bin
+ DATAROOTDIR = $(PREFIX)/share
+@@ -109,12 +109,12 @@ install:
+ FORCE:
+ 
+ install:
+-#	@set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
+-#		$(MAKE) -C $$subdir "PREFIX=$(PREFIX)" install; \
+-#	done
+-#	@set -e; for subdir in $(MACHINES); do \
+-#		$(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" install; \
+-#	done
++	@set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
++		$(MAKE) -C $$subdir "PREFIX=$(PREFIX)" install; \
++	done
++	@set -e; for subdir in $(MACHINES); do \
++		$(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" install; \
++	done
+ 
+ uninstall:
+ #	@set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
diff --git a/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile b/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile
new file mode 100644
index 000000000000..60d1a96a1a40
--- /dev/null
+++ b/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile
@@ -0,0 +1,24 @@
+--- cpmsim/srcsim/Makefile.orig	2024-06-01 14:02:02 UTC
++++ cpmsim/srcsim/Makefile
+@@ -13,7 +13,7 @@ CPROG = $(MACHINE)sim
+ # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ PACKAGE = z80pack
+ CPROG = $(MACHINE)sim
+-PREFIX ?= /usr/local
++PREFIX = /usr/local
+ EXEC_PREFIX = $(PREFIX)
+ BINDIR = $(EXEC_PREFIX)/bin
+ DATAROOTDIR = $(PREFIX)/share
+@@ -103,8 +103,10 @@ install: $(SIM)
+ build: _rm_obj all
+ 
+ install: $(SIM)
+-#	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+-#	$(INSTALL_PROGRAM) -s $(SIM) $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
++	$(INSTALL_PROGRAM) -s $(SIM) $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d $(DESTDIR)$(DISKS_DIR)
++	$(INSTALL_PROGRAM) ../disks/library/*.dsk $(DESTDIR)$(DISKS_DIR)
+ 
+ uninstall:
+ #	rm -f $(DESTDIR)$(BINDIR)/$(CPROG)
diff --git a/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile.bsd b/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile.bsd
deleted file mode 100644
index a34be0654a9d..000000000000
--- a/emulators/z80pack/files/patch-cpmsim_srcsim_Makefile.bsd
+++ /dev/null
@@ -1,23 +0,0 @@
---- cpmsim/srcsim/Makefile.bsd.orig	2021-01-06 16:07:39 UTC
-+++ cpmsim/srcsim/Makefile.bsd
-@@ -1,8 +1,8 @@
- # system wide location for machines configuration files
--CONF=/usr/local/share/cpmsim/conf
-+CONF=${PREFIX}/share/z80pack/conf
- 
- # system wide location for disk images
--DISKS=/usr/local/share/cpmsim/disks
-+DISKS=${PREFIX}/share/z80pack/disks
- 
- CC = cc
- 
-@@ -10,7 +10,8 @@ CC = cc
- #CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -fstack-protector-all -D_FORTIFY_SOURCE=2 -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
- 
- # Production
--CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
-+#CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
-+CFLAGS = ${OPTFLAGS} -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
- 
- LFLAGS =
- 
diff --git a/emulators/z80pack/files/patch-cpmsim_srctools_Makefile b/emulators/z80pack/files/patch-cpmsim_srctools_Makefile
deleted file mode 100644
index 1d2a75a3e83a..000000000000
--- a/emulators/z80pack/files/patch-cpmsim_srctools_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- cpmsim/srctools/Makefile.orig	2021-01-06 16:07:39 UTC
-+++ cpmsim/srctools/Makefile
-@@ -1,19 +1,19 @@
- #
- # some places where the tools usually are installed
- #
--INSTALLDIR=${HOME}/bin
-+#INSTALLDIR=${HOME}/bin
- #INSTALLDIR=/usr/local/bin
- 
- #CC = cc
--CC = gcc
-+#CC = gcc
- 
--CFLAGS= -O3 -Wall
-+#CFLAGS= -O3 -Wall
- 
--all: test mkdskimg bin2hex send receive ptp2bin
--	@echo
--	@echo "Done."
--	@echo "Now run make install"
--	@echo
-+all: mkdskimg bin2hex send receive ptp2bin
-+#	@echo
-+#	@echo "Done."
-+#	@echo "Now run make install"
-+#	@echo
- 
- test:
- 	@test -d ${INSTALLDIR} || (echo "${INSTALLDIR} doesn't exist, fix INSTALLDIR"; exit 1)