diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-09-08 13:52:09 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2022-09-10 18:28:34 +0300 |
| commit | 384c55db62d51422af57df7db94a7a4b6884c976 (patch) | |
| tree | 33cb87b65ea6b1c76f88dde10afbf2a322480d16 | |
| parent | 09a17879f8680abd89f6c7d1e62a0f2132e588dc (diff) | |
MAINT: Also check install-path in mumble-overlay
| -rw-r--r-- | auxiliary_files/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | auxiliary_files/run_scripts/mumble-overlay.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/auxiliary_files/CMakeLists.txt b/auxiliary_files/CMakeLists.txt index 83419f510..c134a30e7 100644 --- a/auxiliary_files/CMakeLists.txt +++ b/auxiliary_files/CMakeLists.txt @@ -46,6 +46,7 @@ if(client) "${CMAKE_CURRENT_SOURCE_DIR}/run_scripts/mumble-overlay.in=${CMAKE_CURRENT_BINARY_DIR}/mumble-overlay" PASSTHROUGH_VARIABLES MUMBLE_BUILD_YEAR + MUMBLE_INSTALL_ABS_LIBDIR VARIABLES "MUMBLE_OVERLAY_BINARY_BASENAME=$<TARGET_FILE_BASE_NAME:overlay_gl>" PYTHON_INTERPRETER "${PYTHON_INTERPRETER}" diff --git a/auxiliary_files/run_scripts/mumble-overlay.in b/auxiliary_files/run_scripts/mumble-overlay.in index 6f32babfa..0c8d9e0b5 100755 --- a/auxiliary_files/run_scripts/mumble-overlay.in +++ b/auxiliary_files/run_scripts/mumble-overlay.in @@ -10,7 +10,7 @@ if [ -z "$1" -o "$1" = '--help' ]; then exit 1 fi -for libpath in /usr/lib /usr/lib/mumble /usr/lib32 /usr/lib32/mumble /usr/lib64 /usr/lib64/mumble; do +for libpath in @MUMBLE_INSTALL_ABS_LIBDIR@ /usr/lib /usr/lib/mumble /usr/lib32 /usr/lib32/mumble /usr/lib64 /usr/lib64/mumble; do if [ -d "$libpath" ]; then for lib in $libpath/lib@MUMBLE_OVERLAY_BINARY_BASENAME@*.so do |