summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2022-03-02 14:41:36 +0000
committerSimon McVittie <smcv@debian.org>2023-06-29 10:55:32 +0100
commitee87b9aed19a63e3df1a224909b1ef44d88044c4 (patch)
tree02d337c4632d2c0b1a5cf56c856c90210e6f91cc
parent3c66e40b21cd97f86fd7908a4c9ac6dbf087a647 (diff)
sdl-config: Remove ${libdir} for multiarch co-installability
This makes the -dev package multiarch co-installable, allowing compilation of SDL programs for more than one architecture on the same system. This is not an upstreamable change, since it relies on a Debian-specific assumption (that we are installing the library into a directory on the linker's default search path). Forwarded: not-needed Gbp-Pq: Topic debian Gbp-Pq: Name sdl-config-Remove-libdir-for-multiarch-co-installability.patch
-rwxr-xr-xsdl-config.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/sdl-config.in b/sdl-config.in
index ce332b3..e0020f4 100755
--- a/sdl-config.in
+++ b/sdl-config.in
@@ -10,7 +10,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
exec_prefix_set=no
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
@ENABLE_STATIC_FALSE@usage="\
@@ -53,11 +52,11 @@ while test $# -gt 0; do
echo -I${includedir}/SDL @SDL_CFLAGS@
;;
@ENABLE_SHARED_TRUE@ --libs)
-@ENABLE_SHARED_TRUE@ echo -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
+@ENABLE_SHARED_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_LIBS@
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
-@ENABLE_STATIC_TRUE@ echo -L${libdir} @SDL_LIBS@ @SDL_STATIC_LIBS@
+@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@
@ENABLE_STATIC_TRUE@ ;;
*)
echo "${usage}" 1>&2