Commit a0b47a8c authored by Sam Lantinga's avatar Sam Lantinga

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

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402112
parent 14eec518
...@@ -2452,10 +2452,10 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects ...@@ -2452,10 +2452,10 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects
if test "x$enable_rpath" = "xyes"; then if test "x$enable_rpath" = "xyes"; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; 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 fi
if test $ARCH = solaris; then if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${exec_prefix}/lib" SDL_RLD_FLAGS="-R\${libdir}"
fi fi
else else
SDL_RLD_FLAGS="" SDL_RLD_FLAGS=""
...@@ -2464,7 +2464,7 @@ fi ...@@ -2464,7 +2464,7 @@ fi
case "$ARCH" in case "$ARCH" in
macosx) macosx)
# Evil hack to allow static linking on Mac OS X # Evil hack to allow static linking on Mac OS X
SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS" SDL_STATIC_LIBS="\${libdir}/libSDL.a $EXTRA_LDFLAGS"
;; ;;
*) *)
SDL_STATIC_LIBS="$SDL_LIBS" SDL_STATIC_LIBS="$SDL_LIBS"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment