database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix make install/ mysqld_safe

Browse Source
This commit is contained in:
Vladislav Vaintroub
2009-11-14 14:29:14 +01:00
parent 1b2fe5f257
commit 9edb94c69e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -134,7 +134,7 @@ IF(WIN32)
SET(DEFAULT_MYSQL_HOME "C:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/" ) SET(DEFAULT_MYSQL_HOME "C:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/" )
SET(SHAREDIR share) SET(SHAREDIR share)
ELSE() ELSE()
SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}/mysql/) SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
SET(SHAREDIR ${DEFAULT_MYSQL_HOME}share) SET(SHAREDIR ${DEFAULT_MYSQL_HOME}share)
ENDIF() ENDIF()

9
scripts/CMakeLists.txt
View File

@ -55,7 +55,12 @@ ENDIF()
ENDIF(UNIX) ENDIF(UNIX)
# some scripts use @TARGET_LINUX@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET(TARGET_LINUX 1)
ELSE()
SET(TARGET_LINUX 0)
ENDIF()
# Build comp_sql - used for embedding SQL in C or C++ programs # Build comp_sql - used for embedding SQL in C or C++ programs
IF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING)
ADD_EXECUTABLE(comp_sql comp_sql.c) ADD_EXECUTABLE(comp_sql comp_sql.c)
@ -107,7 +112,7 @@ SET(LDFLAGS "${CMAKE_SHARED_LIBRARY_LINK_FLAGS}")
IF(WIN32) IF(WIN32)
SET(prefix "${CMAKE_INSTALL_PREFIX}/MySQL Server ${MYSQL_BASE_VERSION}") SET(prefix "${CMAKE_INSTALL_PREFIX}/MySQL Server ${MYSQL_BASE_VERSION}")
ELSE() ELSE()
set(prefix "${CMAKE_INSTALL_PREFIX}/mysql") set(prefix "${CMAKE_INSTALL_PREFIX}")
ENDIF() ENDIF()
SET(sysconfdir ${prefix}) SET(sysconfdir ${prefix})