summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2006-09-24 00:44:45 +0000
committerSam Lantinga <slouken@libsdl.org>2006-09-24 00:44:45 +0000
commitade32b616b58023a712a698388210448e67895ef (patch)
treef5b047dcc2a074b18360aac44b96ade889618581
parent8fe919e1d698c35ab08f92d8bfce2543680f34a8 (diff)
downloadsdl-ade32b616b58023a712a698388210448e67895ef.tar.gz
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
-rw-r--r--configure.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 38a87ad5e..4fc57dfc8 100644
--- a/configure.in
+++ b/configure.in
@@ -2452,10 +2452,10 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects
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=""
@@ -2464,7 +2464,7 @@ fi
case "$ARCH" in
macosx)
# 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"