File addon-helpers_lib64.patch of Package kodi.binary-addons-next

File addon-helpers_lib64.patch of Package kodi.binary-addons-next (Revision 10)

Currently displaying revision 10 , Show latest

diff -ru xbmc-19.0-Matrix.orig/cmake/scripts/common/AddonHelpers.cmake xbmc-19.0-Matrix/cmake/scripts/common/AddonHelpers.cmake
--- xbmc-19.0-Matrix.orig/cmake/scripts/common/AddonHelpers.cmake	2021-02-18 23:17:59.000000000 +0100
+++ xbmc-19.0-Matrix/cmake/scripts/common/AddonHelpers.cmake	2021-03-10 19:08:09.742982609 +0100
@@ -339,14 +339,14 @@
         set(CMAKE_INSTALL_DATADIR "${${APP_NAME_UC}_DATA_DIR}" CACHE PATH "${APP_NAME} install datadir" FORCE)
       else()
         if(NOT CMAKE_INSTALL_LIBDIR)
-          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}")
+          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/@@@_libdir@@@//${APP_NAME_LC}")
         endif()
         if(NOT CMAKE_INSTALL_DATADIR)
           set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/${APP_NAME_LC}")
         endif()
       endif()
     else()
-      set(CMAKE_INSTALL_LIBDIR "lib/${APP_NAME_LC}")
+      set(CMAKE_INSTALL_LIBDIR "@@@_libdir@@@/${APP_NAME_LC}")
       set(CMAKE_INSTALL_DATADIR "share/${APP_NAME_LC}")
     endif()
     if(${prefix}_SOURCES)