diff options
author | Corey Hulen <corey@hulen.com> | 2016-03-17 11:05:29 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-03-17 11:05:29 -0700 |
commit | 8d571ee498c97128bd797f8ac1cb4c3c995fb875 (patch) | |
tree | a5c52fa803440a9cdee4cd39d3c36d75ba2a7032 /Makefile | |
parent | bd225dca738400495a8ef8fea0fc81fd11d225c7 (diff) | |
parent | 6eaede448684cf9654e488474cb7b45a6161107a (diff) | |
download | chat-8d571ee498c97128bd797f8ac1cb4c3c995fb875.tar.gz chat-8d571ee498c97128bd797f8ac1cb4c3c995fb875.tar.bz2 chat-8d571ee498c97128bd797f8ac1cb4c3c995fb875.zip |
Merge pull request #2456 from chengweiv5/fix-build
Makefile: fix for non-enterprise build
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -131,7 +131,9 @@ package: sed -i'.bak' 's|bundle.js|bundle-$(BUILD_NUMBER).js|g' $(DIST_PATH)/webapp/dist/root.html rm $(DIST_PATH)/webapp/dist/root.html.bak - sudo mv -f $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json || echo 'nomv' + @if [ "$(BUILD_ENTERPRISE)" = "true" ] && [ -d "$(ENTERPRISE_DIR)" ]; then \ + sudo mv -f $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json || echo 'nomv'; \ + fi tar -C dist -czf $(DIST_PATH).tar.gz mattermost |