From 4f0bccb63bfc97f7cbd510db9aef7f1486a2633e Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 8 May 2014 10:38:40 +0100 Subject: Make the KF5_LIBEXEC_INSTALL_DIR default depend on LIBEXEC_INSTALL_DIR This way, overriding LIBEXEC_INSTALL_DIR will change where frameworks install libexec files in the expected way. REVIEW: 118048 --- kde-modules/KDEInstallDirs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 9efa90f8..cadbba13 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -197,10 +197,10 @@ _set_fancy(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}sbin" _set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${_LIBDIR_DEFAULT}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib[64], Debian multiarch is taken into account)") if(WIN32) _set_fancy(LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" "The install dir for libexec executables (default is ${BIN_INSTALL_DIR} on Windows)") - _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" "The install dir for KF5 libexec executables (default is ${BIN_INSTALL_DIR} on Windows)") + _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" "The install dir for KF5 libexec executables (default is ${LIBEXEC_INSTALL_DIR} on Windows)") else() _set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/libexec)") - _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/libexec/kf5" "The install dir for KF5 libexec executables (default is ${LIB_INSTALL_DIR}/libexec/kf5)") + _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}/kf5" "The install dir for KF5 libexec executables (default is ${LIBEXEC_INSTALL_DIR}/kf5)") endif() _set_fancy(INCLUDE_INSTALL_DIR "include" "The install dir for header files") # this exists as a convenience for frameworks -- cgit v1.2.1