From 6f3474db2d5047985cddc98c511f1f1070c2ef07 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 3 Jun 2022 19:58:25 +0200 Subject: [PATCH] autotools: export relative path of an installed sdl2-config.cmake to the prefix root --- configure | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/configure b/configure index 3943176a0..9d37869e6 100755 --- a/configure +++ b/configure @@ -653,6 +653,7 @@ SDL_RLD_FLAGS SDL_STATIC_LIBS SDL_LIBS SDL_CFLAGS +cmake_prefix_relpath INSTALL_SDL2_CONFIG LIBUSB_LIBS LIBUSB_CFLAGS @@ -27052,6 +27053,11 @@ fi SDL_STATIC_LIBS="$EXTRA_LDFLAGS" +eval pkg_prefix=$prefix +eval pkg_cmakedir=$libdir/cmake/SDL2 +cmake_prefix_relpath="$(echo -n "$pkg_cmakedir" | sed -E "s#^$pkg_prefix##" | sed -E "s#[A-Za-z0-9_ .-]+#..#g" )" + + diff --git a/configure.ac b/configure.ac index 87cdcf327..b81286efe 100644 --- a/configure.ac +++ b/configure.ac @@ -4688,6 +4688,12 @@ fi SDL_STATIC_LIBS="$EXTRA_LDFLAGS" +dnl Calculate the location of the prefix, relative to the cmake folder +eval pkg_prefix=$prefix +eval pkg_cmakedir=$libdir/cmake/SDL2 +cmake_prefix_relpath="$(echo -n "$pkg_cmakedir" | sed -E "s#^$pkg_prefix##" | sed -E "s#[A-Za-z0-9_ .-]+#..#g" )" +AC_SUBST([cmake_prefix_relpath]) + dnl Expand the cflags and libraries needed by apps using SDL AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_LIBS)