--- BasiliskII/Makefile	1999/10/03 16:21:28	1.2
+++ BasiliskII/Makefile	1999/10/03 17:21:45	1.4
@@ -1,54 +1,69 @@
 # Makefile for creating Basilisk II distributions
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
+VERSION = $(shell grep '^Version' <BasiliskII.spec | sed 's/Version: *//')
+
 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
+DOCS = ChangeLog COPYING INSTALL README TECH TODO
+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))"
 
 #
 # 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
 #
-srcrpm: $(SRCARCHIVE) BasiliskII.spec
+rpm: /usr/src/redhat/SOURCES/$(SRCARCHIVE) BasiliskII.spec
+	rpm -ba BasiliskII.spec
 
-#
-# Binary RPM for Unix/i386
-#
-i386rpm:
+/usr/src/redhat/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
+	cp $(SRCARCHIVE) /usr/src/redhat/SOURCES
 
 #
 # 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 +72,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 +87,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