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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 4 | ||||
| -rw-r--r-- | cmake/install_layout.cmake | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index cfef9eb1eed..f40a38ec775 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -55,8 +55,8 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE " %define mysqldatadir ${INSTALL_MYSQLDATADIR} %define mysqld_user mysql %define mysqld_group mysql -%define _bindir ${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR} -%define _sbindir ${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR} +%define _bindir ${INSTALL_BINDIRABS} +%define _sbindir ${INSTALL_SBINDIRABS} %define _sysconfdir ${INSTALL_SYSCONFDIR} ") diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 7c4639fe76c..757166b7c50 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -236,6 +236,12 @@ FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} CACHE STRING "${var} installation directory" ${FORCE}) MARK_AS_ADVANCED(INSTALL_${var}DIR) + + IF(IS_ABSOLUTE ${INSTALL_${var}DIR}) + SET(INSTALL_${var}DIRABS ${INSTALL_${var}DIR}) + ELSE() + SET(INSTALL_${var}DIRABS "${CMAKE_INSTALL_PREFIX}/${INSTALL_${var}DIR}") + ENDIF() ENDFOREACH() IF(NOT MYSQL_UNIX_ADDR) |