--- BasiliskII/Makefile	1999/10/03 20:40:05	1.5
+++ BasiliskII/Makefile	1999/10/06 13:07:50	1.10
@@ -1,20 +1,22 @@
 # 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)
-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
-RPMDIR = /usr/src/redhat
-DOCS = $(shell sed <BasiliskII.spec -n '/^\%doc */s///p')
-SRCS = src
+VERSION := $(shell sed <BasiliskII.spec -n '/^Version: */s///p')
+RELEASE := $(shell sed <BasiliskII.spec -n '/^Release: */s///p')
+VERNAME := BasiliskII-$(VERSION)
+
+SRCARCHIVE := $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
+SRCRPM := $(VERNAME)-$(RELEASE).src.rpm
+BINRPM := $(VERNAME)-$(RELEASE).i386.rpm
+AMIGAARCHIVE := $(VERNAME)-$(RELEASE).amiga.lha
+BEOSPPCARCHIVE := $(VERNAME)-$(RELEASE).beosppc.zip
+BEOSX86ARCHIVE := $(VERNAME)-$(RELEASE).beosx86.zip
+
+TMPDIR := $(shell date +/tmp/build%M%S)
+RPMDIR := /usr/src/redhat
+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."
@@ -26,14 +28,14 @@ default:
 help:
 	@echo "The following targets are available:"
 	@echo "  tarball  source tarball ($(SRCARCHIVE))"
-	@echo "  rpm      source and binary RPMs ($(SRCRPM) and $(I386RPM))"
+	@echo "  rpm      source and binary RPMs ($(SRCRPM) and $(BINRPM))"
 	@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 $(SRCRPM) $(BINRPM)
 	-rm -f $(AMIGAARCHIVE) $(BEOSPPCARCHIVE) $(BEOSX86ARCHIVE)
 
 #
@@ -42,31 +44,32 @@ clean:
 tarball: $(SRCARCHIVE)
 
 $(SRCARCHIVE): $(SRCS) $(DOCS)
-	-rm -rf $(BUILDDIR)
-	mkdir $(BUILDDIR)
-	cd $(BUILDDIR); cvs checkout 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)
+	-rm -rf $(TMPDIR)
+	mkdir $(TMPDIR)
+	cd $(TMPDIR); cvs export -D "$(ISODATE)" BasiliskII
+	rm $(TMPDIR)/BasiliskII/BasiliskII.spec $(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)
 
 #
 # RPMs (source and i386 binary)
 #
-rpm: $(SRCRPM) $(I386RPM)
+rpm: $(SRCRPM) $(BINRPM)
 
 $(RPMDIR)/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
 	cp $(SRCARCHIVE) $(RPMDIR)/SOURCES
 
-$(RPMDIR)/SRPMS/$(SRCRPM) $(RPMDIR)/RPMS/i386/$(I386RPM): $(RPMDIR)/SOURCES/$(SRCARCHIVE) BasiliskII.spec
+$(RPMDIR)/SRPMS/$(SRCRPM) $(RPMDIR)/RPMS/i386/$(BINRPM): $(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) .
+$(BINRPM): $(RPMDIR)/RPMS/i386/$(BINRPM)
+	cp $(RPMDIR)/RPMS/i386/$(BINRPM) .
 
 #
 # Binary archive for AmigaOS
@@ -74,15 +77,16 @@ $(I386RPM): $(RPMDIR)/RPMS/i386/$(I386RP
 amiga: $(AMIGAARCHIVE)
 
 $(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 a $@ BasiliskII
-	mv $(BUILDDIR)/$@ .
-	rm -rf $(BUILDDIR)
+	-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
@@ -90,14 +94,15 @@ $(AMIGAARCHIVE): $(SRCS) $(DOCS) src/Ami
 beosppc: $(BEOSPPCARCHIVE)
 
 $(BEOSPPCARCHIVE): $(SRCS) $(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)
+	-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
@@ -105,11 +110,12 @@ $(BEOSPPCARCHIVE): $(SRCS) $(DOCS) src/B
 beosx86: $(BEOSX86ARCHIVE)
 
 $(BEOSX86ARCHIVE): $(SRCS) $(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)
+	-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)