Commit 5de274c4 authored by Nirbhay Choubey's avatar Nirbhay Choubey

Fixed install_macros.cmake to set the correct

destination for documentation.
parent e6a7a380
...@@ -53,7 +53,6 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS) ...@@ -53,7 +53,6 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
MESSAGE(FATAL_ERROR "No INSTALL_LOCATION passed to INSTALL_DEBUG_SYMBOLS") MESSAGE(FATAL_ERROR "No INSTALL_LOCATION passed to INSTALL_DEBUG_SYMBOLS")
ENDIF() ENDIF()
SET(targets ${ARG_DEFAULT_ARGS}) SET(targets ${ARG_DEFAULT_ARGS})
FOREACH(target ${targets}) FOREACH(target ${targets})
GET_TARGET_PROPERTY(type ${target} TYPE) GET_TARGET_PROPERTY(type ${target} TYPE)
GET_TARGET_PROPERTY(location ${target} LOCATION) GET_TARGET_PROPERTY(location ${target} LOCATION)
...@@ -174,9 +173,9 @@ FUNCTION(INSTALL_DOCUMENTATION) ...@@ -174,9 +173,9 @@ FUNCTION(INSTALL_DOCUMENTATION)
ENDIF() ENDIF()
IF(RPM) IF(RPM)
SET(destination "${destination}/MariaDB-${group}-${VERSION}") SET(destination "${destination}/MariaDB-Galera-${group}-${VERSION}")
ELSEIF(DEB) ELSEIF(DEB)
SET(destination "${destination}/mariadb-${group}-${MAJOR_VERSION}.${MINOR_VERSION}") SET(destination "${destination}/mariadb-galera-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
ENDIF() ENDIF()
INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT}) INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT})
......
...@@ -181,7 +181,6 @@ install: build ...@@ -181,7 +181,6 @@ install: build
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ 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 $(TMP)/etc/mysql/
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/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_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 install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment