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 210062debeaac5e9
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
     1.1 --- a/SDL.spec.in	Fri Mar 30 06:30:14 2007 +0000
     1.2 +++ b/SDL.spec.in	Sun Apr 01 03:28:36 2007 +0000
     1.3 @@ -54,7 +54,7 @@
     1.4               includedir=$RPM_BUILD_ROOT%{_includedir} \
     1.5               datadir=$RPM_BUILD_ROOT%{_datadir} \
     1.6               mandir=$RPM_BUILD_ROOT%{_mandir}
     1.7 -ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{prefix}/lib/libSDL-1.1.so.0
     1.8 +ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{_libdir}/libSDL-1.1.so.0
     1.9  %else
    1.10  %makeinstall
    1.11  %endif
     2.1 --- a/sdl-config.in	Fri Mar 30 06:30:14 2007 +0000
     2.2 +++ b/sdl-config.in	Sun Apr 01 03:28:36 2007 +0000
     2.3 @@ -3,6 +3,7 @@
     2.4  prefix=@prefix@
     2.5  exec_prefix=@exec_prefix@
     2.6  exec_prefix_set=no
     2.7 +libdir=@libdir@
     2.8  
     2.9  @ENABLE_STATIC_FALSE@usage="\
    2.10  @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"