From: Gianfranco Costamagna Date: Wed, 27 Sep 2017 00:29:24 +0200 Subject: Remove libdir from sdl2-config and sdl2-config.cmake 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 --- sdl2-config.cmake.in | 3 +-- sdl2-config.in | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in index e528a88..993b4ed 100644 --- a/sdl2-config.cmake.in +++ b/sdl2-config.cmake.in @@ -5,9 +5,8 @@ set(exec_prefix "@exec_prefix@") set(libdir "@libdir@") set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") -set(SDL2_LIBDIR "@libdir@") set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") -set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") +set(SDL2_LIBRARIES "@SDL_RLD_FLAGS@ @SDL_LIBS@") string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) if(NOT TARGET SDL2::SDL2) diff --git a/sdl2-config.in b/sdl2-config.in index 5a2aed2..5cc21a6 100644 --- a/sdl2-config.in +++ b/sdl2-config.in @@ -3,7 +3,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no -libdir=@libdir@ @ENABLE_STATIC_FALSE@usage="\ @ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" @@ -45,11 +44,11 @@ while test $# -gt 0; do echo -I@includedir@/SDL2 @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