--- ./include/mariadb_version.h.in.orig	2020-07-20 05:41:17 +0000
+++ ./include/mariadb_version.h.in	2020-07-20 05:41:57 +0000
@@ -24,7 +24,7 @@
 #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@
 #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@"
 #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@"
-#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
+#define MARIADB_PLUGINDIR "@PLUGINDIR@"
 
 /* mysqld compile time options */
 #ifndef MYSQL_CHARSET
--- ./mariadb_config/mariadb_config.c.in.orig	2020-07-20 05:43:02 +0000
+++ ./mariadb_config/mariadb_config.c.in	2020-07-20 05:45:58 +0000
@@ -193,7 +193,7 @@
 
 static char *mariadb_progname;
 
-#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mariadb"
 #define LIBS    "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
 #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
 #define CFLAGS  INCLUDE