From 28909aad84a2e2e85891c8b98b4c256cf19665cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Tue, 10 Dec 2019 14:26:03 +0000 Subject: [PATCH] Use KDEInstallDirs to insert paths into kwinwrapper Reviewed-by: @apol --- bin/CMakeLists.txt | 3 ++- bin/{kwinwrapper => kwinwrapper.in} | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename bin/{kwinwrapper => kwinwrapper.in} (74%) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 1054e8fd..65acd08d 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -1,4 +1,5 @@ -install(PROGRAMS kwinwrapper DESTINATION ${BIN_INSTALL_DIR}) +configure_file(kwinwrapper.in ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper DESTINATION ${BIN_INSTALL_DIR}) configure_file(plasma-mobile.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-mobile.desktop) install(FILES diff --git a/bin/kwinwrapper b/bin/kwinwrapper.in similarity index 74% rename from bin/kwinwrapper rename to bin/kwinwrapper.in index f43d5d94..0fd70509 100755 --- a/bin/kwinwrapper +++ b/bin/kwinwrapper.in @@ -18,10 +18,9 @@ export FORCE_RIL_NUM_MODEMS=1 export PLASMA_DEFAULT_SHELL=org.kde.plasma.phone # work around to fix : https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1507584 -_ARCH=arm-linux-gnueabihf -if [ -d /usr/lib/$_ARCH/libhybris-egl ]; then - export LD_LIBRARY_PATH=/usr/lib/$_ARCH/libhybris-egl:$LD_LIBRARY_PATH +if [ -d @KDE_INSTALL_FULL_LIBDIR@/libhybris-egl ]; then + export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@/libhybris-egl:$LD_LIBRARY_PATH fi touch /tmp/simplelogin_starting -startplasma-wayland --xwayland --libinput --inputmethod maliit-server --exit-with-session=/usr/lib/$_ARCH/libexec/startplasma-waylandsession +startplasma-wayland --xwayland --libinput --inputmethod maliit-server --exit-with-session=@KDE_INSTALL_FULL_LIBEXECDIR@/startplasma-waylandsession