Fixed bug #321 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Sun, 24 Sep 2006 00:43:36 +0000
branchSDL-1.2
changeset 3875 fbde7ed1a835
parent 3874 c1c562a797a7
child 3876 cf4744dbb1cf
Fixed bug #321 Hi, if "configure" is given an explicit --libdir, the sdl-config still contains the default "${exec_prefix}/lib" for runtime linker path. That should be changed to $libdir, as this is where the library goes to... Regards, Juergen
configure.in
--- a/configure.in	Sun Sep 24 00:36:24 2006 +0000
+++ b/configure.in	Sun Sep 24 00:43:36 2006 +0000
@@ -2612,10 +2612,10 @@
 
 if test "x$enable_rpath" = "xyes"; then
   if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
-    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+    SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
   fi
   if test $ARCH = solaris; then
-    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
+    SDL_RLD_FLAGS="-R\${libdir}"
   fi
 else
   SDL_RLD_FLAGS=""
@@ -2630,7 +2630,7 @@
       SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
     fi
     # Evil hack to allow static linking on Mac OS X
-    SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
+    SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS"
     ;;
   *)
     SDL_STATIC_LIBS="$SDL_LIBS"