Merge branch 'install_dir_change' into develop

Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt

server/core/test/CMakeLists.txt

@@ -44,19 +44,4 @@ add_test(Internal-TestUsers test_users)
 add_test(Internal-TestAdminUsers test_adminusers)
 add_test(Internal-TestMemlog testmemlog)
 add_test(TestFeedback testfeedback)
-set_tests_properties(Internal-TestMySQLUsers
-  Internal-TestHash
-  Internal-TestHint
-  Internal-TestSpinlock
-  Internal-TestFilter
-  Internal-TestBuffer
-  Internal-TestDCB
-  Internal-TestModutil
-  Internal-TestPoll
-  Internal-TestService
-  Internal-TestServer
-  Internal-TestUsers
-  Internal-TestAdminUsers
-  Internal-TestMemlog 
-  TestFeedback PROPERTIES ENVIRONMENT MAXSCALE_HOME=${CMAKE_BINARY_DIR}/)
 set_tests_properties(TestFeedback PROPERTIES TIMEOUT 30)

server/core/test/testadminusers.c

@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <gwdirs.h>
 #include <adminusers.h>
 
 
@@ -40,7 +40,7 @@
  * Test that the username password admin/mariadb is accepted if no users
  * have been created and that no other users are accepted
  *
- * WARNING: $MAXSCALE_HOME/etc/passwd must be removed before this test is run
+ * WARNING: The passwd file must be removed before this test is run
  */
 static int
 test1()
@@ -269,9 +269,8 @@ int	result = 0;
 char	*home, buf[1024];
 
 	/* Unlink any existing password file before running this test */
-	if ((home = getenv("MAXSCALE_HOME")) == NULL || strlen(home) >= 1024)
-		home =  "/usr/local/mariadb-maxscale";
-	sprintf(buf, "%s/etc/passwd", home);
+	
+	sprintf(buf, "%s/passwd", default_cachedir);
     if(!is_valid_posix_path(buf))
         exit(1);
 	if (strcmp(buf, "/etc/passwd") != 0)

server/core/test/testfeedback.c

@@ -73,17 +73,8 @@ int main(int argc, char** argv)
     char* cnf;
 
     hkinit();
-    home = getenv("MAXSCALE_HOME");
 
-    if(home == NULL)
-    {
-        FAILTEST("MAXSCALE_HOME was not defined.");
-    }
-    printf("Home: %s\n",home);
-
-    cnf = malloc(strlen(home) + strlen("/etc/MaxScale.cnf") + 1);
-    strcpy(cnf,home);
-    strcat(cnf,"/etc/MaxScale.cnf");
+    cnf = strdup("/etc/MaxScale.cnf");
 
     printf("Config: %s\n",cnf);
 
@@ -116,4 +107,4 @@ int main(int argc, char** argv)
         }
     mysql_library_end();
     return 0;
-}
+}