Fixed install_macros.cmake to set the correct

destination for documentation.
This commit is contained in:
Nirbhay Choubey 2014-02-19 13:59:10 -05:00
parent e6a7a3804d
commit 5de274c43b
2 changed files with 2 additions and 4 deletions

View file

@ -53,7 +53,6 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
MESSAGE(FATAL_ERROR "No INSTALL_LOCATION passed to INSTALL_DEBUG_SYMBOLS")
ENDIF()
SET(targets ${ARG_DEFAULT_ARGS})
FOREACH(target ${targets})
GET_TARGET_PROPERTY(type ${target} TYPE)
GET_TARGET_PROPERTY(location ${target} LOCATION)
@ -174,9 +173,9 @@ FUNCTION(INSTALL_DOCUMENTATION)
ENDIF()
IF(RPM)
SET(destination "${destination}/MariaDB-${group}-${VERSION}")
SET(destination "${destination}/MariaDB-Galera-${group}-${VERSION}")
ELSEIF(DEB)
SET(destination "${destination}/mariadb-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
SET(destination "${destination}/mariadb-galera-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
ENDIF()
INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT})

View file

@ -181,7 +181,6 @@ install: build
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
install -m 0644 Docs/README-wsrep $(TMP)/usr/share/doc/mariadb-galera-server-10.0/README-wsrep
install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC
install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN