From 5394b4d0fab6d71272f0f1da595f71c17baf4e69 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 29 Apr 2015 05:42:58 +0300
Subject: [PATCH] Changed standard installation directory from
 /usr/local/mariadb-maxscale to /usr/local.

---
 CMakeLists.txt             | 11 +----------
 cmake/install_layout.cmake |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43ede7f92..28b3229d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,17 +9,8 @@ message(STATUS "CMake version: ${CMAKE_VERSION}")
 include(${CMAKE_SOURCE_DIR}/cmake/macros.cmake)
 enable_testing()
 
-# Packaging builds install to /usr and other builds to /usr/local/mariadb-maxscale
+# Packaging builds install to /usr and other builds to /usr/local
 if(PACKAGE)
-  set(INSTALL_LAYOUT "PACKAGE" CACHE STRING "Install layout, options are: STANDALONE, PACKAGE")
-else()
-  set(INSTALL_LAYOUT "STANDALONE" CACHE STRING "Install layout, options are: STANDALONE, PACKAGE")
-endif()
-
-# Installation prefixes for different layouts
-if(${INSTALL_LAYOUT} MATCHES "STANDALONE")
-  set(CMAKE_INSTALL_PREFIX "/usr/local/mariadb-maxscale" CACHE PATH "Prefix prepended to install directories.")
-else()
   set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories.")
 endif()
 
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index f7ce45441..c55a25a32 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -1,6 +1,6 @@
 # Set the install layout
 # Possible values:
-# STANDALONE - Installs to /usr/local/mariadb-maxscale
+# STANDALONE - Installs to /usr/local
 # PACKAGE - Installs to /usr
 include(GNUInstallDirs)