From 48c49ee17464c0275219497bcd95771c0ed88734 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 1 Apr 2007 03:28:36 +0000 Subject: [PATCH] Merged r3002:3003 from branches/SDL-1.2: libdir fix in sdl-config and SDL.spec --- SDL.spec.in | 2 +- sdl-config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SDL.spec.in b/SDL.spec.in index 329d5998b..dbda11210 100644 --- a/SDL.spec.in +++ b/SDL.spec.in @@ -54,7 +54,7 @@ make install prefix=$RPM_BUILD_ROOT%{prefix} \ 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 diff --git a/sdl-config.in b/sdl-config.in index 95f4c9e8a..816466b38 100644 --- a/sdl-config.in +++ b/sdl-config.in @@ -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]"