From 973a4b2e7743bf0b6ef1ec30d58f2d07d18b3183 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 1 Apr 2020 01:00:42 -0400 Subject: [PATCH] cmake: fix bugged WEECHAT_SHAREDIR definition exposed by DATAROOTDIR rename configure.ac defines this to /usr/share/weechat, which means scripts can load from this directory as a fallback for $HOME/.weechat/, but cmake defines this instead as /usr/share, which means system-installed fallback scripts would need to be installed to /usr/share/python/foo.py instead, and that's completely insane! Fix this discrepancy by creating a cmake define specifically for WEECHAT_SHAREDIR based on the datarootdir, just like autotools does it. --- CMakeLists.txt | 4 ++++ config.h.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5b228975..dee229e9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,10 @@ if(NOT DEFINED DATAROOTDIR) set(DATAROOTDIR ${CMAKE_INSTALL_PREFIX}/share) endif() +if(NOT DEFINED WEECHAT_SHAREDIR) + set(WEECHAT_SHAREDIR ${DATAROOTDIR}/weechat) +endif() + if(NOT DEFINED MANDIR) set(MANDIR ${DATAROOTDIR}/man) endif() diff --git a/config.h.cmake b/config.h.cmake index 41d47ce21..62882e514 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -14,7 +14,7 @@ #define PACKAGE_NAME "@PROJECT_NAME@" #define PACKAGE_STRING "@PKG_STRING@" #define WEECHAT_LIBDIR "@WEECHAT_LIBDIR@" -#define WEECHAT_SHAREDIR "@DATAROOTDIR@" +#define WEECHAT_SHAREDIR "@WEECHAT_SHAREDIR@" #define LOCALEDIR "@LOCALEDIR@" #define WEECHAT_HOME "@WEECHAT_HOME@" #define CA_FILE "@CA_FILE@"