Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths Index: mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in =================================================================== --- mariadb-connector-c-2.3.3-src.orig/mariadb_config/mariadb_config.c.in +++ mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in @@ -2,12 +2,12 @@ #include #include -#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql" -#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \ +#define INCLUDE "-I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/mariadb" +#define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" #define VERSION "@MYSQL_CLIENT_VERSION@" -#define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@" +#define PLUGIN_DIR "@PLUGIN_INSTALL_DIR@" #define SOCKET "@MYSQL_UNIX_ADDR@" #define PORT "@MYSQL_PORT@" Index: mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt =================================================================== --- mariadb-connector-c-2.3.3-src.orig/libmariadb/CMakeLists.txt +++ mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt @@ -430,9 +430,9 @@ ENDIF() INSTALL(TARGETS libmariadb mariadbclient - RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" - LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}" - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}") + RUNTIME DESTINATION "${LIB_INSTALL_DIR}" + LIBRARY DESTINATION "${LIB_INSTALL_DIR}" + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})