diff options
| author | Vladislav Vaintroub <vvaintroub@u8> | 2009-11-14 14:29:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@u8> | 2009-11-14 14:29:14 +0100 |
| commit | 20b785c0fb112da72979431f18654d4f93acdaa6 (patch) | |
| tree | bfecf53cb99d84a518982b06435e0af15a36c732 | |
| parent | d71dfe2122ce18b0bbe4763a51b7c2096fc951a5 (diff) | |
| download | mariadb-git-20b785c0fb112da72979431f18654d4f93acdaa6.tar.gz | |
fix make install/ mysqld_safe
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/CMakeLists.txt | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d55d115cff..4ee7aa414e3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ IF(WIN32) SET(DEFAULT_MYSQL_HOME "C:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/" ) SET(SHAREDIR share) ELSE() - SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}/mysql/) + SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}) SET(SHAREDIR ${DEFAULT_MYSQL_HOME}share) ENDIF() diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index de3e4c661f6..0403a1bb5ae 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -55,7 +55,12 @@ ENDIF() 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 IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(comp_sql comp_sql.c) @@ -107,7 +112,7 @@ SET(LDFLAGS "${CMAKE_SHARED_LIBRARY_LINK_FLAGS}") IF(WIN32) SET(prefix "${CMAKE_INSTALL_PREFIX}/MySQL Server ${MYSQL_BASE_VERSION}") ELSE() - set(prefix "${CMAKE_INSTALL_PREFIX}/mysql") + set(prefix "${CMAKE_INSTALL_PREFIX}") ENDIF() SET(sysconfdir ${prefix}) |