diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 372ad3f7b..885e30643 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -45,7 +45,7 @@ if(NOT UNIX_STRUCTURE) set(OBS_DATA_PATH "../${OBS_DATA_DESTINATION}") set(OBS_INSTALL_PREFIX "") - set(OBS_RELATIVE_PLUGIN_DEST "../${OBS_PLUGIN_DESTINATION}") + set(OBS_RELATIVE_PREFIX "../") else() set(OBS_EXECUTABLE_DESTINATION "bin/${_lib_suffix}bit") set(OBS_EXECUTABLE32_DESTINATION "bin/32bit") @@ -59,27 +59,31 @@ if(NOT UNIX_STRUCTURE) set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}") set(OBS_INSTALL_PREFIX "") - set(OBS_RELATIVE_PLUGIN_DEST "../../${OBS_PLUGIN_DESTINATION}") + set(OBS_RELATIVE_PREFIX "../../") endif() set(OBS_CMAKE_DESTINATION "cmake") set(OBS_INCLUDE_DESTINATION "include") else() + if(NOT OBS_MULTIARCH_SUFFIX AND DEFINED ENV{OBS_MULTIARCH_SUFFIX}) + set(OBS_MULTIARCH_SUFFIX "$ENV{OBS_MULTIARCH_SUFFIX}") + endif() + set(OBS_EXECUTABLE_DESTINATION "bin") set(OBS_EXECUTABLE32_DESTINATION "bin32") set(OBS_EXECUTABLE64_DESTINATION "bin64") - set(OBS_LIBRARY_DESTINATION "lib") + set(OBS_LIBRARY_DESTINATION "lib${OBS_MULTIARCH_SUFFIX}") set(OBS_LIBRARY32_DESTINATION "lib32") set(OBS_LIBRARY64_DESTINATION "lib64") - set(OBS_PLUGIN_DESTINATION "lib/obs-plugins") - set(OBS_PLUGIN32_DESTINATION "lib32/obs-plugins") - set(OBS_PLUGIN64_DESTINATION "lib64/obs-plugins") + set(OBS_PLUGIN_DESTINATION "${OBS_LIBRARY_DESTINATION}/obs-plugins") + set(OBS_PLUGIN32_DESTINATION "${OBS_LIBRARY32_DESTINATION}/obs-plugins") + set(OBS_PLUGIN64_DESTINATION "${OBS_LIBRARY64_DESTINATION}/obs-plugins") set(OBS_DATA_DESTINATION "share/obs") - set(OBS_CMAKE_DESTINATION "lib/cmake") + set(OBS_CMAKE_DESTINATION "${OBS_LIBRARY_DESTINATION}/cmake") set(OBS_INCLUDE_DESTINATION "include/obs") set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") - set(OBS_RELATIVE_PLUGIN_DEST "../${OBS_PLUGIN_DESTINATION}") + set(OBS_RELATIVE_PREFIX "../") endif() function(obs_finish_bundle) diff --git a/libobs/obs-config.h b/libobs/obs-config.h index 0f6cfa88d..dfda62350 100644 --- a/libobs/obs-config.h +++ b/libobs/obs-config.h @@ -59,7 +59,8 @@ # define OBS_VERSION "unknown" # define OBS_DATA_PATH "../../data" # define OBS_INSTALL_PREFIX "" -# define OBS_RELATIVE_PLUGIN_DEST "../../obs-plugins" +# define OBS_PLUGIN_DESTINATION "obs-plugins" +# define OBS_RELATIVE_PREFIX "../../" #endif #define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in index 2c68d53bf..f6b636fd2 100644 --- a/libobs/obsconfig.h.in +++ b/libobs/obsconfig.h.in @@ -4,4 +4,5 @@ #define OBS_VERSION "@OBS_VERSION@" #define OBS_DATA_PATH "@OBS_DATA_PATH@" #define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@" -#define OBS_RELATIVE_PLUGIN_DEST "@OBS_RELATIVE_PLUGIN_DEST@" +#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@" +#define OBS_RELATIVE_PREFIX "@OBS_RELATIVE_PREFIX@"