--- BasiliskII/Makefile	1999/10/03 16:21:28	1.2
+++ BasiliskII/Makefile	2000/10/10 19:28:59	1.14
@@ -1,83 +1,107 @@
 # Makefile for creating Basilisk II distributions
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
-SRCARCHIVE = $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
-AMIGAARCHIVE = $(shell date +BasiliskII_amiga_%d%m%Y.lha)
-BEOSPPCARCHIVE = $(shell date +BasiliskII_beos_ppc_%d%m%Y.zip)
-BEOSX86ARCHIVE = $(shell date +BasiliskII_beos_x86_%d%m%Y.zip)
-
-BUILDDIR = /tmp/build
-DOCS = CHANGES COPYING README TECH TODO
-SRC = src
+VERSION := $(shell sed <BasiliskII.spec -n '/^\%define version */s///p')
+RELEASE := $(shell sed <BasiliskII.spec -n '/^\%define release */s///p')
+VERNAME := BasiliskII-$(VERSION)
+
+SRCARCHIVE := $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
+AMIGAARCHIVE := $(VERNAME)-$(RELEASE).amiga.lzh
+BEOSPPCARCHIVE := $(VERNAME)-$(RELEASE).beosppc.zip
+BEOSX86ARCHIVE := $(VERNAME)-$(RELEASE).beosx86.zip
+
+TMPDIR := $(shell date +/tmp/build%M%S)
+ISODATE := $(shell date "+%Y-%m-%d %H:%M")
+DOCS := $(shell sed <BasiliskII.spec -n '/^\%doc */s///p')
+SRCS := src
+
+default:
+	@echo "This top-level Makefile is for creating Basilisk II distributions."
+	@echo "If you want to install Basilisk II V$(VERSION) on your system, please follow"
+	@echo "the instructions in the file INSTALL."
+	@echo "If you want to create a Basilisk II V$(VERSION) distribution, type \"make help\""
+	@echo "to get a list of possible targets."
+
+help:
+	@echo "The following targets are available:"
+	@echo "  tarball  source tarball ($(SRCARCHIVE))"
+	@echo "  rpm      source and binary RPMs"
+	@echo "  amiga    AmigaOS binary archive ($(AMIGAARCHIVE))"
+	@echo "  beosppc  BeOS/ppc binary archive ($(BEOSPPCARCHIVE))"
+	@echo "  beosx86  BeOS/x86 binary archive ($(BEOSX86ARCHIVE))"
+
+clean:
+	-rm -f $(SRCARCHIVE)
+	-rm -f $(AMIGAARCHIVE) $(BEOSPPCARCHIVE) $(BEOSX86ARCHIVE)
 
 #
 # Source tarball
 #
 tarball: $(SRCARCHIVE)
 
-$(SRCARCHIVE): $(SRC) $(DOCS)
-	-rm -rf $(BUILDDIR)
-	mkdir $(BUILDDIR)
-	cd $(BUILDDIR); cvs checkout BasiliskII
-	rm $(BUILDDIR)/BasiliskII/BasiliskII.spec
-	rm $(BUILDDIR)/BasiliskII/Makefile
-	rm -rf $(BUILDDIR)/BasiliskII/src/powerrom_cpu
-	cd $(BUILDDIR); tar cfz $@ BasiliskII
-	mv $(BUILDDIR)/$@ .
-	rm -rf $(BUILDDIR)
+$(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
+	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)/$@ .
+	rm -rf $(TMPDIR)
 
 #
-# Source RPM
+# RPMs (source and binary)
 #
-srcrpm: $(SRCARCHIVE) BasiliskII.spec
-
-#
-# Binary RPM for Unix/i386
-#
-i386rpm:
+rpm: $(SRCARCHIVE)
+	rpm -ta --clean $(SRCARCHIVE)
 
 #
 # Binary archive for AmigaOS
 #
 amiga: $(AMIGAARCHIVE)
 
-$(AMIGAARCHIVE): $(SRC) $(DOCS) src/AmigaOS/BasiliskII
-	-rm -rf $(BUILDDIR)
-	mkdir $(BUILDDIR)
-	mkdir $(BUILDDIR)/BasiliskII
-	cp $(DOCS) $(BUILDDIR)/BasiliskII
-	cp src/AmigaOS/BasiliskII $(BUILDDIR)/BasiliskII
-	cp src/AmigaOS/BasiliskII.info $(BUILDDIR)/BasiliskII.info
-	cd $(BUILDDIR); lha av $@ BasiliskII
-	mv $(BUILDDIR)/$@ .
-	rm -rf $(BUILDDIR)
+$(AMIGAARCHIVE): $(SRCS) $(DOCS) src/AmigaOS/BasiliskII
+	-rm -rf $(TMPDIR)
+	mkdir $(TMPDIR)
+	mkdir $(TMPDIR)/$(VERNAME)
+	cp $(DOCS) $(TMPDIR)/$(VERNAME)
+	cp src/AmigaOS/BasiliskII $(TMPDIR)/$(VERNAME)
+	cp src/AmigaOS/BasiliskII.info $(TMPDIR)/$(VERNAME)
+	chmod 775 $(TMPDIR)/$(VERNAME)/BasiliskII
+	cd $(TMPDIR); lha a $@ $(VERNAME)
+	mv $(TMPDIR)/$@ .
+	rm -rf $(TMPDIR)
 
 #
 # Binary archive for BeOS/ppc
 #
 beosppc: $(BEOSPPCARCHIVE)
 
-$(BEOSPPCARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.ppc/BasiliskII
-	-rm -rf $(BUILDDIR)
-	mkdir $(BUILDDIR)
-	mkdir $(BUILDDIR)/BasiliskII
-	cp $(DOCS) $(BUILDDIR)/BasiliskII
-	mv src/BeOS/obj.ppc/BasiliskII $(BUILDDIR)/BasiliskII
-	cd $(BUILDDIR); zip -ry $@ BasiliskII/
-	mv $(BUILDDIR)/$@ .
-	rm -rf $(BUILDDIR)
+$(BEOSPPCARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.ppc/BasiliskII
+	-rm -rf $(TMPDIR)
+	mkdir $(TMPDIR)
+	mkdir $(TMPDIR)/$(VERNAME)
+	cp $(DOCS) $(TMPDIR)/$(VERNAME)
+	cp src/BeOS/obj.ppc/BasiliskII $(TMPDIR)/$(VERNAME)
+	mimeset -f $(TMPDIR)
+	cd $(TMPDIR); zip -ry $@ $(VERNAME)/
+	mv $(TMPDIR)/$@ .
+	rm -rf $(TMPDIR)
 
 #
 # Binary archive for BeOS/x86
 #
 beosx86: $(BEOSX86ARCHIVE)
 
-$(BEOSX86ARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.x86/BasiliskII
-	-rm -rf $(BUILDDIR)
-	mkdir $(BUILDDIR)
-	mkdir $(BUILDDIR)/BasiliskII
-	cp $(DOCS) $(BUILDDIR)/BasiliskII
-	mv src/BeOS/obj.x86/BasiliskII $(BUILDDIR)/BasiliskII
-	cd $(BUILDDIR); zip -ry $@ BasiliskII/
-	mv $(BUILDDIR)/$@ .
-	rm -rf $(BUILDDIR)
+$(BEOSX86ARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.x86/BasiliskII
+	-rm -rf $(TMPDIR)
+	mkdir $(TMPDIR)
+	mkdir $(TMPDIR)/$(VERNAME)
+	cp $(DOCS) $(TMPDIR)/$(VERNAME)
+	cp src/BeOS/obj.x86/BasiliskII $(TMPDIR)/$(VERNAME)
+	mimeset -f $(TMPDIR)
+	cd $(TMPDIR); zip -ry $@ $(VERNAME)/
+	mv $(TMPDIR)/$@ .
+	rm -rf $(TMPDIR)