Mercurial > sdl-ios-xcode

changeset 138:69ee0b88b615

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
author Sam Lantinga <slouken@libsdl.org>
date Thu, 09 Aug 2001 05:31:32 +0000
parents 4738ea544d7a
children ef23a1bf1244
files Makefile.am src/cdrom/Makefile.am src/main/Makefile.am src/thread/Makefile.am src/timer/Makefile.am
diffstat 5 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
+++ b/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
@@ -36,6 +36,7 @@
         WhatsNew	\
         docs.html	\
         sdl.m4		\
+        SDL.spec	\
         autogen.sh	\
         strip_fPIC.sh
 
@@ -48,8 +49,7 @@
 
 # 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 @@
 # 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
--- a/src/cdrom/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
+++ b/src/cdrom/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
@@ -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
--- a/src/main/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
+++ b/src/main/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
@@ -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
--- a/src/thread/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
+++ b/src/thread/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
@@ -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
--- a/src/timer/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
+++ b/src/timer/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
@@ -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