From 591d020e26c5bf927dd1531e15eafa2bf2251357 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 9 Aug 2001 05:31:32 +0000
Subject: [PATCH] Applied Paul Jenner's patches to fix "make distcheck" and
 "make rpm"

---
 Makefile.am            | 6 +++---
 src/cdrom/Makefile.am  | 4 +++-
 src/main/Makefile.am   | 3 ++-
 src/thread/Makefile.am | 3 ++-
 src/timer/Makefile.am  | 3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 890271e4a..ca20e2729 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST =		\
         WhatsNew	\
         docs.html	\
         sdl.m4		\
+        SDL.spec	\
         autogen.sh	\
         strip_fPIC.sh
 
@@ -48,8 +49,7 @@ $(PACKAGE)-$(VERSION).tar.gz: dist
 
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba SDL.spec
+	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
 
 # Rule to rebuild the export lists for BeOS, MacOS and Win32.
 exports:
@@ -79,7 +79,7 @@ install-hook:
 # Grab the test programs for the distribution:
 dist-hook:
 	if test -f test/Makefile; then (cd test; make distclean); fi
-	cp -rp test $(distdir)
+	cp -rp $(srcdir)/test $(distdir)
 	rm -rf `find $(distdir) -type d -name CVS -print`
 
 # Create a CVS snapshot that people can run update -d on
diff --git a/src/cdrom/Makefile.am b/src/cdrom/Makefile.am
index 3a19cabdf..0fddeb8e2 100644
--- a/src/cdrom/Makefile.am
+++ b/src/cdrom/Makefile.am
@@ -3,7 +3,9 @@
 
 noinst_LTLIBRARIES = libcdrom.la
 
-ARCH_SUBDIRS = dummy beos freebsd linux macos openbsd qnx win32
+ARCH_SUBDIRS = $(srcdir)/dummy $(srcdir)/beos $(srcdir)/freebsd \
+	$(srcdir)/linux $(srcdir)/macos $(srcdir)/openbsd \
+	$(srcdir)/qnx $(srcdir)/win32
 
 # Include the architecture-independent sources
 COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index d67b0a139..651e5f690 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -4,7 +4,8 @@
 # This is necessary because some platforms have special program
 # entry points, which require special application initialization.
 
-ARCH_SUBDIRS = beos linux macos win32
+ARCH_SUBDIRS = $(srcdir)/beos $(srcdir)/linux $(srcdir)/macos \
+	$(srcdir)/win32
 
 # Build a separate library containing the main() entry point.
 lib_LIBRARIES = libSDLmain.a
diff --git a/src/thread/Makefile.am b/src/thread/Makefile.am
index 0a318ac76..ae6c2f8bd 100644
--- a/src/thread/Makefile.am
+++ b/src/thread/Makefile.am
@@ -3,7 +3,8 @@
 
 noinst_LTLIBRARIES = libthread.la
 
-ARCH_SUBDIRS = generic amigaos beos irix linux win32
+ARCH_SUBDIRS = $(srcdir)/generic $(srcdir)/amigaos $(srcdir)/beos \
+	$(srcdir)/irix $(srcdir)/linux $(srcdir)/win32
 
 # Older versions of Linux require an asm clone() implementation
 if USE_CLONE
diff --git a/src/timer/Makefile.am b/src/timer/Makefile.am
index 801fd86df..2481dd894 100644
--- a/src/timer/Makefile.am
+++ b/src/timer/Makefile.am
@@ -3,7 +3,8 @@
 
 noinst_LTLIBRARIES = libtimer.la
 
-ARCH_SUBDIRS = amigaos beos linux macos win32
+ARCH_SUBDIRS = $(srcdir)/amigaos $(srcdir)/beos $(srcdir)/linux \
+	$(srcdir)/macos $(srcdir)/win32
 
 # Include the architecture-independent sources
 COMMON_SRCS = SDL_timer.c SDL_timer_c.h SDL_systimer.h