From 429eeba1a7d7230ea3c91653f2e739dc99ef76af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Thu, 25 May 2017 11:18:12 +0300
Subject: [PATCH] Update Building-MaxScale-from-Source-Code.md

Moved distribution specific commands to a new quickstart section, added a
copy-and-paste section for the generic commands. This should make it easier
to do a generic installation of MaxScale on a supported system.
---
 .../Building-MaxScale-from-Source-Code.md     | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
index 2cb45ab0b..43b108734 100644
--- a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
+++ b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
@@ -11,7 +11,42 @@ requirements are as follows:
 * Bison 2.7 or later
 * Flex 2.5.35 or later
 * libuuid
-* libmicrohttpd
+* GNUTLS
+
+## Quickstart
+
+This installs MaxScale as if it was installed from a package.
+
+### Install dependencies
+
+CentOS 7:
+
+```
+sudo yum install git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake \
+     libgcc perl make libtool openssl openssl-devel libcurl-devel pcre-devel \
+     tcl tcl-devel systemtap-sdt-devel libuuid libuuid-devel sqlite sqlite-devel \
+     gnutls gcrypt
+```
+
+Ubuntu 16.04:
+
+```
+sudo apt-get install git build-essential libssl-dev ncurses-dev bison flex \
+     cmake perl libtool libcurl4-openssl-dev libpcre3-dev tcl tcl-dev uuid \
+     uuid-dev libsqlite3-dev libgnutls30 libgcrypt20
+```
+
+### Build and Install MaxScale
+
+```
+git clone https://github.com/mariadb-corporation/MaxScale
+mkdir build
+cd build
+cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr
+make
+sudo make install
+sudo ./postinst
+```
 
 ## Required packages
 
@@ -27,15 +62,6 @@ systemtap-sdt-devel libuuid libuuid-devel sqlite sqlite-devel
 gnutls gcrypt
 ```
 
-You can install the packages with the following commands.
-
-```
-sudo yum install git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake \
-     libgcc perl make libtool openssl openssl-devel libcurl-devel pcre-devel \
-     tcl tcl-devel systemtap-sdt-devel libuuid libuuid-devel sqlite sqlite-devel \
-     gnutls gcrypt
-```
-
 ### Required packages on Ubuntu and Debian systems
 
 The following packages are required on Ubuntu 16.04. Different releases may
@@ -47,14 +73,6 @@ libcurl4-openssl-dev libpcre3-dev tlc tcl-dev uuid uuid-dev sqlite3-dev
 libgnutls30 libgcrypt20
 ```
 
-You can install the packages with the following command.
-
-```
-sudo apt-get install git build-essential libssl-dev ncurses-dev bison flex \
-     cmake perl libtool libcurl4-openssl-dev libpcre3-dev tcl tcl-dev uuid \
-     uuid-dev libsqlite3-dev libgnutls30 libgcrypt20
-```
-
 ## Preparing the MariaDB MaxScale build
 
 Clone the MariaDB MaxScale repository from GitHub.