- updated RPM spec file and top-level Makefile

- renamed CHANGES to ChangeLog

BasiliskII/BasiliskII.spec

@@ -1,14 +1,12 @@
 Summary:   A free, portable Mac II emulator
 Name:      BasiliskII
 Version:   0.7
-Release:   2
+Release:   1
 URL:       http://www.uni-mainz.de/~bauec002/B2Main.html
-Source:    BasiliskII_src_250799.tar.gz
+Source:    BasiliskII_src_03101999.tar.gz
 Copyright: GPL
 Group:     Applications/Emulators
-Vendor: PLD
-Packager: Christian Bauer <Christian.Bauer@uni-mainz.de>
-BuildRoot: /tmp/%{name}-%{version}-root
+Packager:  Christian Bauer <Christian.Bauer@uni-mainz.de>
 
 %description
 Basilisk II is a free, portable, Open Source 68k Mac emulator. It requires
@@ -35,30 +33,18 @@ Some features of Basilisk II:
 
 %build
 cd src/Unix
-./configure --prefix=/usr
-
+./configure --prefix=/usr --exec_prefix=/usr/X11R6
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/usr/lib/BasiliskII/Linux
-install -d $RPM_BUILD_ROOT/usr/X11R6/bin
-
-install -m755 -s src/Unix/BasiliskII $RPM_BUILD_ROOT/usr/X11R6/bin
-
-cp -R src/Unix/Linux/* $RPM_BUILD_ROOT/usr/lib/BasiliskII/Linux
-mkdir docs
-cp CHANGES COPYING README TECH TODO docs
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+cd src/Unix
+make install
 
 %files
-%defattr(-,root,root)
-%doc docs/*
-/usr/lib/BasiliskII
-/usr/X11R6/bin/*
+%doc ChangeLog COPYING README TECH TODO
+/usr/X11R6/bin/BasiliskII
+/usr/man/man1/BasiliskII.1
+/usr/share/BasiliskII/keycodes
 
 %changelog
 * Fri Jul 23 1999 Roman Niewiarowski <newrom@pasjo.net.pl>

BasiliskII/Makefile

@@ -2,14 +2,20 @@
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
 SRCARCHIVE = $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
-BUILDDIR = $(shell echo /tmp/build$$)
+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
 
 #
 # Source tarball
 #
-srcdist: $(SRCARCHIVE)
+tarball: $(SRCARCHIVE)
 
-$(SRCARCHIVE): src CHANGES COPYING README TECH TODO
+$(SRCARCHIVE): $(SRC) $(DOCS)
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	cd $(BUILDDIR); cvs checkout BasiliskII
@@ -21,11 +27,57 @@ $(SRCARCHIVE): src CHANGES COPYING README TECH TODO
 	rm -rf $(BUILDDIR)
 
 #
-# RPM source archive
+# Source RPM
 #
-srcrpm: $(SRCARCHIVE)
+srcrpm: $(SRCARCHIVE) BasiliskII.spec
 
 #
-# RPM binary archive (Unix/i386)
+# Binary RPM for Unix/i386
 #
 i386rpm:
+
+#
+# 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)
+
+#
+# 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)
+
+#
+# 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)

BasiliskII/README

@@ -707,7 +707,7 @@ There is no user-level support for Basilisk II at the moment.
 History
 -------
 
-Please consult the file "CHANGES" for the release history.
+Please consult the file "ChangeLog" for the release history.
 
 
 Christian Bauer