From d58682d261344075fa4ea0bee317186ac530c01c Mon Sep 17 00:00:00 2001
From: Mark Riddoch <Mark.Riddoch@skysql.com>
Date: Tue, 1 Jul 2014 16:53:10 +0100
Subject: [PATCH] Updated Makefile to resolve issue with adding extra MaxScale
 in the path for a make install command.

---
 server/Makefile                                | 12 ++++++------
 server/core/Makefile                           |  2 +-
 server/modules/filter/Makefile                 |  2 +-
 server/modules/monitor/Makefile                |  2 +-
 server/modules/protocol/Makefile               |  2 +-
 server/modules/routing/Makefile                |  2 +-
 server/modules/routing/readwritesplit/Makefile |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/Makefile b/server/Makefile
index d6aba988e..09120da07 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -61,14 +61,14 @@ depend:
 
 install:
 	@mkdir -p $(DEST)
-	@mkdir -p $(DEST)/MaxScale
-	@mkdir -p $(DEST)/MaxScale/modules
-	@mkdir -p $(DEST)/MaxScale/log
-	@mkdir -p $(DEST)/MaxScale/etc
-	@mkdir -p $(DEST)/MaxScale/mysql
+	@mkdir -p $(DEST)
+	@mkdir -p $(DEST)/modules
+	@mkdir -p $(DEST)/log
+	@mkdir -p $(DEST)/etc
+	@mkdir -p $(DEST)/mysql
 	@mkdir -p $(DEST)/lib
 	@mkdir -p $(DEST)/Documentation
-	install -b MaxScale_template.cnf $(DEST)/MaxScale/etc
+	install -b MaxScale_template.cnf $(DEST)/etc
 	install ../Documentation/*.pdf $(DEST)/Documentation
 	(cd core; make DEST=$(DEST) install)
 	(cd modules/routing; make DEST=$(DEST) install)
diff --git a/server/core/Makefile b/server/core/Makefile
index 0a8de1a4a..6f08a4729 100644
--- a/server/core/Makefile
+++ b/server/core/Makefile
@@ -122,6 +122,6 @@ install: maxscale maxkeys maxpasswd
 	@mkdir -p $(DEST)/bin
 	install -D maxscale maxkeys maxpasswd  $(DEST)/bin
 	install -D $(EMBEDDED_LIB)/$(LIB) $(DEST)/lib
-	install -D $(ERRMSG)/errmsg.sys $(DEST)/MaxScale/mysql
+	install -D $(ERRMSG)/errmsg.sys $(DEST)/mysql
 
 include depend.mk
diff --git a/server/modules/filter/Makefile b/server/modules/filter/Makefile
index b51a9e671..931c35ab1 100644
--- a/server/modules/filter/Makefile
+++ b/server/modules/filter/Makefile
@@ -79,7 +79,7 @@ depend:
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)
-	install -D $(MODULES) $(DEST)/MaxScale/modules
+	install -D $(MODULES) $(DEST)/modules
 
 cleantests:
 	$(MAKE) -C test cleantests
diff --git a/server/modules/monitor/Makefile b/server/modules/monitor/Makefile
index 45a56a916..7fdbc5843 100644
--- a/server/modules/monitor/Makefile
+++ b/server/modules/monitor/Makefile
@@ -65,6 +65,6 @@ depend:
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)
-	install -D $(MODULES) $(DEST)/MaxScale/modules
+	install -D $(MODULES) $(DEST)/modules
 
 include depend.mk
diff --git a/server/modules/protocol/Makefile b/server/modules/protocol/Makefile
index 789cd9b78..bca893942 100644
--- a/server/modules/protocol/Makefile
+++ b/server/modules/protocol/Makefile
@@ -80,7 +80,7 @@ tags:
 	ctags $(SRCS) $(HDRS)
 
 install: $(MODULES)
-	install -D $(MODULES) $(DEST)/MaxScale/modules
+	install -D $(MODULES) $(DEST)/modules
 
 depend: 
 	rm -f depend.mk
diff --git a/server/modules/routing/Makefile b/server/modules/routing/Makefile
index 8019513c7..4feac68fb 100644
--- a/server/modules/routing/Makefile
+++ b/server/modules/routing/Makefile
@@ -84,7 +84,7 @@ depend:
 	(cd readwritesplit; touch depend.mk ; make depend)
 
 install: $(MODULES)
-	install -D $(MODULES) $(DEST)/MaxScale/modules
+	install -D $(MODULES) $(DEST)/modules
 	(cd readwritesplit; make DEST=$(DEST) install)
 
 cleantests:
diff --git a/server/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile
index 2d4aba7f0..c60f2ffd1 100644
--- a/server/modules/routing/readwritesplit/Makefile
+++ b/server/modules/routing/readwritesplit/Makefile
@@ -60,7 +60,7 @@ depend:
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 
 install: $(MODULES)
-	install -D $(MODULES) $(DEST)/MaxScale/modules
+	install -D $(MODULES) $(DEST)/modules
 	
 cleantests:
 	$(MAKE) -C test cleantest