Replace 'make' with '$(MAKE)'
Fix the build under the platform that GNU make is installed as gmake.
Этот коммит содержится в:
8
Makefile
8
Makefile
@@ -133,7 +133,7 @@ build: .prebuild prepare-enterprise
|
|||||||
build-client:
|
build-client:
|
||||||
@echo Building mattermost web app
|
@echo Building mattermost web app
|
||||||
|
|
||||||
cd $(BUILD_WEBAPP_DIR) && make build
|
cd $(BUILD_WEBAPP_DIR) && $(MAKE) build
|
||||||
|
|
||||||
|
|
||||||
package: build build-client
|
package: build build-client
|
||||||
@@ -183,7 +183,7 @@ run-server: prepare-enterprise start-docker
|
|||||||
run-client:
|
run-client:
|
||||||
@echo Running mattermost client for development
|
@echo Running mattermost client for development
|
||||||
|
|
||||||
cd $(BUILD_WEBAPP_DIR) && make run
|
cd $(BUILD_WEBAPP_DIR) && $(MAKE) run
|
||||||
|
|
||||||
run: run-server run-client
|
run: run-server run-client
|
||||||
|
|
||||||
@@ -203,7 +203,7 @@ stop-server:
|
|||||||
stop-client:
|
stop-client:
|
||||||
@echo Stopping mattermost client
|
@echo Stopping mattermost client
|
||||||
|
|
||||||
cd $(BUILD_WEBAPP_DIR) && make stop
|
cd $(BUILD_WEBAPP_DIR) && $(MAKE) stop
|
||||||
|
|
||||||
|
|
||||||
stop: stop-server stop-client
|
stop: stop-server stop-client
|
||||||
@@ -218,7 +218,7 @@ clean: stop-docker
|
|||||||
rm -Rf $(DIST_ROOT)
|
rm -Rf $(DIST_ROOT)
|
||||||
go clean $(GOFLAGS) -i ./...
|
go clean $(GOFLAGS) -i ./...
|
||||||
|
|
||||||
cd $(BUILD_WEBAPP_DIR) && make clean
|
cd $(BUILD_WEBAPP_DIR) && $(MAKE) clean
|
||||||
|
|
||||||
rm -rf api/data
|
rm -rf api/data
|
||||||
rm -rf logs
|
rm -rf logs
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user