diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-16 17:29:26 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-22 19:13:51 +0400 |
| commit | c597ed01112c2f6549c59e6548d4ff53803487df (patch) | |
| tree | 938550a7cdce894ef0f89152c2f2f6f5ac98b0eb /support-files | |
| parent | d8e127f9f4eb634be2b84de3384709060db70b43 (diff) | |
| download | mariadb-git-c597ed01112c2f6549c59e6548d4ff53803487df.tar.gz | |
MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths
Allow absolute paths for INSTALL_*DIR.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index c369e1d633d..eceff5fcf18 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -20,8 +20,8 @@ IF(WIN32) ELSE() SET(localstatedir "${MYSQL_DATADIR}") SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(libexecdir "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR}") - SET(bindir "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}" ) + SET(libexecdir ${INSTALL_SBINDIRABS}) + SET(bindir ${INSTALL_BINDIRABS}) SET(sbindir "${libexecdir}") SET(datadir "${MYSQL_DATADIR}") SET(CC ${CMAKE_C_COMPILER}) @@ -66,11 +66,11 @@ IF(UNIX) INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) + SET(bindir ${INSTALL_BINDIRABS}) + SET(sbindir ${INSTALL_SBINDIRABS}) + SET(scriptdir ${INSTALL_SCRIPTDIRABS}) + SET(libexecdir ${INSTALL_SBINDIRABS}) + SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server |