--- BasiliskII/Makefile	1999/10/03 16:21:28	1.2
+++ BasiliskII/Makefile	1999/10/03 20:40:05	1.5
@@ -1,54 +1,86 @@
 # Makefile for creating Basilisk II distributions
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
+VERSION = $(shell sed <BasiliskII.spec -n '/^Version: */s///p')
+RELEASE = $(shell sed <BasiliskII.spec -n '/^Release: */s///p')
+
 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)
+SRCRPM = BasiliskII-$(VERSION)-$(RELEASE).src.rpm
+I386RPM = BasiliskII-$(VERSION)-$(RELEASE).i386.rpm
+AMIGAARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).amiga.lha
+BEOSPPCARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).beosppc.zip
+BEOSX86ARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).beosx86.zip
 
 BUILDDIR = /tmp/build
-DOCS = CHANGES COPYING README TECH TODO
-SRC = src
+RPMDIR = /usr/src/redhat
+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 ($(SRCRPM) and $(I386RPM))"
+	@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 $(SRCRPM)
+	-rm -f $(AMIGAARCHIVE) $(BEOSPPCARCHIVE) $(BEOSX86ARCHIVE)
 
 #
 # Source tarball
 #
 tarball: $(SRCARCHIVE)
 
-$(SRCARCHIVE): $(SRC) $(DOCS)
+$(SRCARCHIVE): $(SRCS) $(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
+	rm -rf $(BUILDDIR)/BasiliskII/src/powerrom_cpu	#not yet ready for distribution
+	mv $(BUILDDIR)/BasiliskII $(BUILDDIR)/BasiliskII-$(VERSION)
+	cd $(BUILDDIR); tar cfz $@ BasiliskII-$(VERSION)
 	mv $(BUILDDIR)/$@ .
 	rm -rf $(BUILDDIR)
 
 #
-# Source RPM
+# RPMs (source and i386 binary)
 #
-srcrpm: $(SRCARCHIVE) BasiliskII.spec
+rpm: $(SRCRPM) $(I386RPM)
 
-#
-# Binary RPM for Unix/i386
-#
-i386rpm:
+$(RPMDIR)/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
+	cp $(SRCARCHIVE) $(RPMDIR)/SOURCES
+
+$(RPMDIR)/SRPMS/$(SRCRPM) $(RPMDIR)/RPMS/i386/$(I386RPM): $(RPMDIR)/SOURCES/$(SRCARCHIVE) BasiliskII.spec
+	rpm -ba BasiliskII.spec
+
+$(SRCRPM): $(RPMDIR)/SRPMS/$(SRCRPM)
+	cp $(RPMDIR)/SRPMS/$(SRCRPM) .
+
+$(I386RPM): $(RPMDIR)/RPMS/i386/$(I386RPM)
+	cp $(RPMDIR)/RPMS/i386/$(I386RPM) .
 
 #
 # Binary archive for AmigaOS
 #
 amiga: $(AMIGAARCHIVE)
 
-$(AMIGAARCHIVE): $(SRC) $(DOCS) src/AmigaOS/BasiliskII
+$(AMIGAARCHIVE): $(SRCS) $(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
+	cd $(BUILDDIR); lha a $@ BasiliskII
 	mv $(BUILDDIR)/$@ .
 	rm -rf $(BUILDDIR)
 
@@ -57,7 +89,7 @@ $(AMIGAARCHIVE): $(SRC) $(DOCS) src/Amig
 #
 beosppc: $(BEOSPPCARCHIVE)
 
-$(BEOSPPCARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.ppc/BasiliskII
+$(BEOSPPCARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.ppc/BasiliskII
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	mkdir $(BUILDDIR)/BasiliskII
@@ -72,7 +104,7 @@ $(BEOSPPCARCHIVE): $(SRC) $(DOCS) src/Be
 #
 beosx86: $(BEOSX86ARCHIVE)
 
-$(BEOSX86ARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.x86/BasiliskII
+$(BEOSX86ARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.x86/BasiliskII
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	mkdir $(BUILDDIR)/BasiliskII