hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Makefile to resolve issue with adding extra MaxScale in the

Browse Source 
path for a make install command.
This commit is contained in:
Mark Riddoch
2014-07-01 16:53:10 +01:00
parent 29503ce566
commit d58682d261
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/Makefile
View File

@ -61,14 +61,14 @@ depend:
install: install:
@mkdir -p $(DEST) @mkdir -p $(DEST)
@mkdir -p $(DEST)/MaxScale @mkdir -p $(DEST)
@mkdir -p $(DEST)/MaxScale/modules @mkdir -p $(DEST)/modules
@mkdir -p $(DEST)/MaxScale/log @mkdir -p $(DEST)/log
@mkdir -p $(DEST)/MaxScale/etc @mkdir -p $(DEST)/etc
@mkdir -p $(DEST)/MaxScale/mysql @mkdir -p $(DEST)/mysql
@mkdir -p $(DEST)/lib @mkdir -p $(DEST)/lib
@mkdir -p $(DEST)/Documentation @mkdir -p $(DEST)/Documentation
install -b MaxScale_template.cnf $(DEST)/MaxScale/etc install -b MaxScale_template.cnf $(DEST)/etc
install ../Documentation/*.pdf $(DEST)/Documentation install ../Documentation/*.pdf $(DEST)/Documentation
(cd core; make DEST=$(DEST) install) (cd core; make DEST=$(DEST) install)
(cd modules/routing; make DEST=$(DEST) install) (cd modules/routing; make DEST=$(DEST) install)

2
server/core/Makefile
View File

@ -122,6 +122,6 @@ install: maxscale maxkeys maxpasswd
@mkdir -p $(DEST)/bin @mkdir -p $(DEST)/bin
install -D maxscale maxkeys maxpasswd $(DEST)/bin install -D maxscale maxkeys maxpasswd $(DEST)/bin
install -D $(EMBEDDED_LIB)/$(LIB) $(DEST)/lib 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 include depend.mk

2
server/modules/filter/Makefile
View File

@ -79,7 +79,7 @@ depend:
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/modules
cleantests: cleantests:
$(MAKE) -C test cleantests $(MAKE) -C test cleantests

2
server/modules/monitor/Makefile
View File

@ -65,6 +65,6 @@ depend:
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/modules
include depend.mk include depend.mk

2
server/modules/protocol/Makefile
View File

@ -80,7 +80,7 @@ tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/modules
depend: depend:
rm -f depend.mk rm -f depend.mk

2
server/modules/routing/Makefile
View File

@ -84,7 +84,7 @@ depend:
(cd readwritesplit; touch depend.mk ; make depend) (cd readwritesplit; touch depend.mk ; make depend)
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/modules
(cd readwritesplit; make DEST=$(DEST) install) (cd readwritesplit; make DEST=$(DEST) install)
cleantests: cleantests:

2
server/modules/routing/readwritesplit/Makefile
View File

@ -60,7 +60,7 @@ depend:
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/modules
cleantests: cleantests:
$(MAKE) -C test cleantest $(MAKE) -C test cleantest