summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index eb25f40f2..6551f6d07 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ dist: | build-server build-client go-test package
dist-local: | start-docker dist
dist-travis: | travis-init build-container
+ mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json;
start-docker:
@echo Starting docker containers
@@ -147,10 +148,6 @@ package:
sed -i'.bak' 's|libs.min.js|libs-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html
rm $(DIST_PATH)/web/templates/*.bak
- if [ "$(TRAVIS_DB)" != "" ]; then \
- mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json; \
- fi
-
tar -C dist -czf $(DIST_PATH).tar.gz mattermost
build-client: