File absolute_path_fix.patch of Package mariadb-connector-c

Overview Repositories Revisions Requests Users Attributes Meta

File absolute_path_fix.patch of Package mariadb-connector-c

Author: Adam Majer <amajer@suse.de>
Date: Fri Mar  3 15:59:09 CET 2017
Summary: Remove pure ugliness with paths

Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
===================================================================
--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in
+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
@@ -5,14 +5,14 @@
 
 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 "\
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
+#define LIBS    "-L@INSTALL_LIBDIR@ -lmariadb "\
                 "@extra_dynamic_LDFLAGS@"
 #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
 #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@"
Index: mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in
===================================================================
--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/libmariadb.pc.in
+++ mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in
@@ -6,14 +6,14 @@
 #  Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
 #
 
-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+libdir=@INCLUDE_INSTALL_DIR@
 prefix=@PREFIX_INSTALL_DIR@
 
 Name: libmariadb
 Version: @LIBMARIADB_VERSION@
 Description: MariaDB Connector/C dynamic library
-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
+Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@
+Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@

Places

File absolute_path_fix.patch of Package mariadb-connector-c

Places