--- a/Makefile.in Mon Feb 20 11:30:29 2006 +0000
+++ b/Makefile.in Mon Feb 20 11:49:16 2006 +0000
@@ -6,11 +6,11 @@
depend = build-deps
prefix = @prefix@
exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
-mandir = @mandir@
+bindir = $(DESTDIR)@bindir@
+libdir = $(DESTDIR)@libdir@
+includedir = $(DESTDIR)@includedir@
+datadir = $(DESTDIR)@datadir@
+mandir = $(DESTDIR)@mandir@
distpath = $(srcdir)/..
distdir = SDL-@SDL_VERSION@
distfile = $(distdir).tar.gz
@@ -34,7 +34,7 @@
BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
-BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) $? -o $@
+BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) `echo $? | sed 's| .*||'` -o $@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
--- a/SDL.spec.in Mon Feb 20 11:30:29 2006 +0000
+++ b/SDL.spec.in Mon Feb 20 11:49:16 2006 +0000
@@ -45,13 +45,13 @@
%install
rm -rf $RPM_BUILD_ROOT
%ifos linux
-make install prefix=$RPM_BUILD_ROOT/%{prefix} \
- bindir=$RPM_BUILD_ROOT/%{_bindir} \
- libdir=$RPM_BUILD_ROOT/%{_libdir} \
- includedir=$RPM_BUILD_ROOT/%{_includedir} \
- datadir=$RPM_BUILD_ROOT/%{_datadir} \
- mandir=$RPM_BUILD_ROOT/%{_mandir}
-ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{prefix}/lib/libSDL-1.1.so.0
+make install prefix=$RPM_BUILD_ROOT%{prefix} \
+ bindir=$RPM_BUILD_ROOT%{_bindir} \
+ libdir=$RPM_BUILD_ROOT%{_libdir} \
+ includedir=$RPM_BUILD_ROOT%{_includedir} \
+ datadir=$RPM_BUILD_ROOT%{_datadir} \
+ mandir=$RPM_BUILD_ROOT%{_mandir}
+ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{prefix}/lib/libSDL-1.1.so.0
%else
%makeinstall
%endif