Merged r3002:3003 from branches/SDL-1.2: libdir fix in sdl-config and SDL.spec
authorRyan C. Gordon <icculus@icculus.org>
Sun, 01 Apr 2007 03:28:36 +0000
changeset 2100 62debeaac5e9
parent 2099 891ed60fcaa9
child 2101 c4e0afbcf1f6
Merged r3002:3003 from branches/SDL-1.2: libdir fix in sdl-config and SDL.spec
SDL.spec.in
sdl-config.in
--- a/SDL.spec.in	Fri Mar 30 06:30:14 2007 +0000
+++ b/SDL.spec.in	Sun Apr 01 03:28:36 2007 +0000
@@ -54,7 +54,7 @@
              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
+ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{_libdir}/libSDL-1.1.so.0
 %else
 %makeinstall
 %endif
--- a/sdl-config.in	Fri Mar 30 06:30:14 2007 +0000
+++ b/sdl-config.in	Sun Apr 01 03:28:36 2007 +0000
@@ -3,6 +3,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
+libdir=@libdir@
 
 @ENABLE_STATIC_FALSE@usage="\
 @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"