Skip to content

Commit

Permalink
Merge commit 'a0d2974bf29bf49fb8f9d1fd75fd2fa211df883d' into 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
9EOR9 committed Jun 26, 2019
2 parents 808f48a + a0d2974 commit 3927466
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion mariadb_config/libmariadb.pc.in
Expand Up @@ -14,6 +14,7 @@ Name: libmariadb
Version: @CPACK_PACKAGE_VERSION@
Description: MariaDB Connector/C dynamic library
Cflags: -I${includedir}
Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
Libs: -L${libdir} -lmariadb
Libs.private: @extra_dynamic_LDFLAGS@


2 changes: 1 addition & 1 deletion mariadb_config/mariadb_config.c.in
Expand Up @@ -6,7 +6,7 @@
static char *mariadb_progname;

#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
Expand Down

0 comments on commit 3927466

Please sign in to comment.