--- BasiliskII/Makefile	2000/10/10 19:28:59	1.14
+++ BasiliskII/Makefile	2005/06/30 21:27:26	1.20
@@ -1,5 +1,5 @@
 # Makefile for creating Basilisk II distributions
-# Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
+# Written in 2002 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
 VERSION := $(shell sed <BasiliskII.spec -n '/^\%define version */s///p')
 RELEASE := $(shell sed <BasiliskII.spec -n '/^\%define release */s///p')
@@ -9,6 +9,7 @@ SRCARCHIVE := $(shell date +BasiliskII_s
 AMIGAARCHIVE := $(VERNAME)-$(RELEASE).amiga.lzh
 BEOSPPCARCHIVE := $(VERNAME)-$(RELEASE).beosppc.zip
 BEOSX86ARCHIVE := $(VERNAME)-$(RELEASE).beosx86.zip
+MACOSXARCHIVE := $(VERNAME)-$(RELEASE).tar.gz
 
 TMPDIR := $(shell date +/tmp/build%M%S)
 ISODATE := $(shell date "+%Y-%m-%d %H:%M")
@@ -29,6 +30,7 @@ help:
 	@echo "  amiga    AmigaOS binary archive ($(AMIGAARCHIVE))"
 	@echo "  beosppc  BeOS/ppc binary archive ($(BEOSPPCARCHIVE))"
 	@echo "  beosx86  BeOS/x86 binary archive ($(BEOSX86ARCHIVE))"
+	@echo "  macosx   MacOS X binary archive ($(MACOSXARCHIVE))"
 
 clean:
 	-rm -f $(SRCARCHIVE)
@@ -43,9 +45,9 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
 	-rm -rf $(TMPDIR)
 	mkdir $(TMPDIR)
 	cd $(TMPDIR); cvs export -D "$(ISODATE)" BasiliskII
-	cp src/Unix/config.h.in src/Unix/configure $(TMPDIR)/BasiliskII/src/Unix
+	cd $(TMPDIR)/BasiliskII/src/Unix && NO_CONFIGURE=1 ./autogen.sh
+	cd $(TMPDIR)/BasiliskII/src/Windows && NO_CONFIGURE=1 ../Unix/autogen.sh
 	rm $(TMPDIR)/BasiliskII/Makefile
-	rm -rf $(TMPDIR)/BasiliskII/src/powerrom_cpu	#not yet ready for distribution
 	mv $(TMPDIR)/BasiliskII $(TMPDIR)/$(VERNAME)
 	cd $(TMPDIR); tar cfz $@ $(VERNAME)
 	mv $(TMPDIR)/$@ .
@@ -55,7 +57,7 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
 # RPMs (source and binary)
 #
 rpm: $(SRCARCHIVE)
-	rpm -ta --clean $(SRCARCHIVE)
+	rpmbuild -ta --clean $(SRCARCHIVE)
 
 #
 # Binary archive for AmigaOS
@@ -105,3 +107,18 @@ $(BEOSX86ARCHIVE): $(SRCS) $(DOCS) src/B
 	cd $(TMPDIR); zip -ry $@ $(VERNAME)/
 	mv $(TMPDIR)/$@ .
 	rm -rf $(TMPDIR)
+
+#
+# Binary archive for MacOS X
+#
+macosx: $(MACOSXARCHIVE)
+
+$(MACOSXARCHIVE): $(SRCS) $(DOCS) src/MacOSX/build/BasiliskII.app
+	-rm -rf $(TMPDIR)
+	mkdir $(TMPDIR)
+	mkdir $(TMPDIR)/$(VERNAME)
+	cp $(DOCS) $(TMPDIR)/$(VERNAME)
+	cp -pr src/MacOSX/build/BasiliskII.app $(TMPDIR)/$(VERNAME)
+	cd $(TMPDIR); tar -czvf $@ $(VERNAME)/
+	mv $(TMPDIR)/$@ .
+	rm -rf $(TMPDIR)