summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-28 09:20:05 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-28 09:20:05 -0400
commitdbd503138f1e13935c539225e768f346d79a89f2 (patch)
treeaee68ea30bc8a7d320d08e14ef7d3df5c13c219b
parent5d8f27b9cdd6ffb3b0db733c370389b363efc704 (diff)
parent23d2d08229d3a2e11ae1222a29ff491068645078 (diff)
downloadchat-dbd503138f1e13935c539225e768f346d79a89f2.tar.gz
chat-dbd503138f1e13935c539225e768f346d79a89f2.tar.bz2
chat-dbd503138f1e13935c539225e768f346d79a89f2.zip
Merge pull request #2539 from ryoon/gnu-make-as-gmake
Replace 'make' with '$(MAKE)'
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 492275eca..af5214388 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@ build: .prebuild prepare-enterprise
build-client:
@echo Building mattermost web app
- cd $(BUILD_WEBAPP_DIR) && make build
+ cd $(BUILD_WEBAPP_DIR) && $(MAKE) build
package: build build-client
@@ -183,7 +183,7 @@ run-server: prepare-enterprise start-docker
run-client:
@echo Running mattermost client for development
- cd $(BUILD_WEBAPP_DIR) && make run
+ cd $(BUILD_WEBAPP_DIR) && $(MAKE) run
run: run-server run-client
@@ -203,7 +203,7 @@ stop-server:
stop-client:
@echo Stopping mattermost client
- cd $(BUILD_WEBAPP_DIR) && make stop
+ cd $(BUILD_WEBAPP_DIR) && $(MAKE) stop
stop: stop-server stop-client
@@ -218,7 +218,7 @@ clean: stop-docker
rm -Rf $(DIST_ROOT)
go clean $(GOFLAGS) -i ./...
- cd $(BUILD_WEBAPP_DIR) && make clean
+ cd $(BUILD_WEBAPP_DIR) && $(MAKE) clean
rm -rf api/data
rm -rf logs