From 5de274c43b82cd0eaab606bf6a02e687f5c81f43 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Wed, 19 Feb 2014 13:59:10 -0500 Subject: [PATCH] Fixed install_macros.cmake to set the correct destination for documentation. --- cmake/install_macros.cmake | 5 ++--- debian/dist/Ubuntu/rules | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index d154fb81956..ebca9f14c31 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -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}) diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index ec82eafe109..7f3a7c99d47 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -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