Further fix of the '--plugindir' output from the config binary; #1569159

This commit is contained in:
Michal Schorm 2018-04-23 14:17:42 +02:00
parent 17ca9eb97e
commit 921a542134
2 changed files with 16 additions and 1 deletions

View File

@ -11,3 +11,14 @@
"@extra_dynamic_LDFLAGS@"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE
--- mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in 2018-04-23 14:05:44.061943591 +0200
+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in_patched 2018-04-23 14:12:11.645251018 +0200
@@ -12,7 +12,7 @@ static char *mariadb_progname;
#define CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
-#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@"
#define SOCKET "@MARIADB_UNIX_ADDR@"
#define PORT "@MARIADB_PORT@"
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"

View File

@ -1,6 +1,6 @@
Name: mariadb-connector-c
Version: 3.0.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The MariaDB Native Client library (C driver)
License: LGPLv2+
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
@ -149,6 +149,10 @@ end
# https://jira.mariadb.org/browse/CONC-291
%changelog
* Mon Apr 23 2018 Michal Schorm <mschorm@redhat.com> - 3.0.3-4
- Further fix of the '--plugindir' output from the config binary
Realted: #1569159
* Wed Mar 21 2018 Richard W.M. Jones <rjones@redhat.com> - 3.0.3-3
- Fix plugin install directory (INSTALL_PLUGINDIR not PLUGIN_INSTALL_DIR).