diff options
Diffstat (limited to 'databases/mariadb101-client/files/patch-scripts_CMakeLists.txt')
| -rw-r--r-- | databases/mariadb101-client/files/patch-scripts_CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt index dc385a444ceb..5d53de0b4146 100644 --- a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC +--- scripts/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC +++ scripts/CMakeLists.txt @@ -73,6 +73,7 @@ IF(UNIX) ) @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -84,6 +85,7 @@ INSTALL(FILES +@@ -82,6 +83,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -136,6 +138,7 @@ ENDIF() +@@ -134,6 +136,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI +@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -195,6 +199,7 @@ ELSE() +@@ -193,6 +197,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -208,6 +213,7 @@ INSTALL_SCRIPT( +@@ -206,6 +211,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -286,18 +292,8 @@ ELSE() +@@ -284,18 +290,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config |
