1.1 --- a/Makefile.in Mon Feb 20 11:30:29 2006 +0000
1.2 +++ b/Makefile.in Mon Feb 20 11:49:16 2006 +0000
1.3 @@ -6,11 +6,11 @@
1.4 depend = build-deps
1.5 prefix = @prefix@
1.6 exec_prefix = @exec_prefix@
1.7 -bindir = @bindir@
1.8 -libdir = @libdir@
1.9 -includedir = @includedir@
1.10 -datadir = @datadir@
1.11 -mandir = @mandir@
1.12 +bindir = $(DESTDIR)@bindir@
1.13 +libdir = $(DESTDIR)@libdir@
1.14 +includedir = $(DESTDIR)@includedir@
1.15 +datadir = $(DESTDIR)@datadir@
1.16 +mandir = $(DESTDIR)@mandir@
1.17 distpath = $(srcdir)/..
1.18 distdir = SDL-@SDL_VERSION@
1.19 distfile = $(distdir).tar.gz
1.20 @@ -34,7 +34,7 @@
1.21 BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
1.22 BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
1.23 BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
1.24 -BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) $? -o $@
1.25 +BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) `echo $? | sed 's| .*||'` -o $@
1.26
1.27 LT_AGE = @LT_AGE@
1.28 LT_CURRENT = @LT_CURRENT@
2.1 --- a/SDL.spec.in Mon Feb 20 11:30:29 2006 +0000
2.2 +++ b/SDL.spec.in Mon Feb 20 11:49:16 2006 +0000
2.3 @@ -45,13 +45,13 @@
2.4 %install
2.5 rm -rf $RPM_BUILD_ROOT
2.6 %ifos linux
2.7 -make install prefix=$RPM_BUILD_ROOT/%{prefix} \
2.8 - bindir=$RPM_BUILD_ROOT/%{_bindir} \
2.9 - libdir=$RPM_BUILD_ROOT/%{_libdir} \
2.10 - includedir=$RPM_BUILD_ROOT/%{_includedir} \
2.11 - datadir=$RPM_BUILD_ROOT/%{_datadir} \
2.12 - mandir=$RPM_BUILD_ROOT/%{_mandir}
2.13 -ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{prefix}/lib/libSDL-1.1.so.0
2.14 +make install prefix=$RPM_BUILD_ROOT%{prefix} \
2.15 + bindir=$RPM_BUILD_ROOT%{_bindir} \
2.16 + libdir=$RPM_BUILD_ROOT%{_libdir} \
2.17 + includedir=$RPM_BUILD_ROOT%{_includedir} \
2.18 + datadir=$RPM_BUILD_ROOT%{_datadir} \
2.19 + mandir=$RPM_BUILD_ROOT%{_mandir}
2.20 +ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{prefix}/lib/libSDL-1.1.so.0
2.21 %else
2.22 %makeinstall
2.23 %endif