diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-09 11:54:14 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-09 11:54:14 -0400 |
| commit | a0febe2f3156ceb02635d9ecd5124da49c494161 (patch) | |
| tree | 84acf0bf39eded4dd6a58059251864cc8b2da284 /Makefile | |
| parent | b67bb7e6fe29aa39f5b2976b1ca1f119f459d4c1 (diff) | |
| parent | 12cd7c03d6676466f7b10b8e80b4e05edab0cf2a (diff) | |
| download | chat-a0febe2f3156ceb02635d9ecd5124da49c494161.tar.gz chat-a0febe2f3156ceb02635d9ecd5124da49c494161.tar.bz2 chat-a0febe2f3156ceb02635d9ecd5124da49c494161.zip | |
Merge branch 'release-1.1.0'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -88,6 +88,11 @@ travis: mkdir -p $(DIST_PATH)/web/static/js cp -L web/static/js/*.min.js $(DIST_PATH)/web/static/js/ + cp -RL web/static/config $(DIST_PATH)/web/static + cp -RL web/static/css $(DIST_PATH)/web/static + cp -RL web/static/fonts $(DIST_PATH)/web/static + cp -RL web/static/help $(DIST_PATH)/web/static + cp -RL web/static/images $(DIST_PATH)/web/static cp -RL web/static/js/jquery-dragster $(DIST_PATH)/web/static/js/ cp -RL web/templates $(DIST_PATH)/web @@ -265,8 +270,14 @@ dist: install cd web/sass-files && compass compile -e production --force - mkdir -p $(DIST_PATH)/web - cp -RL web/static $(DIST_PATH)/web + mkdir -p $(DIST_PATH)/web/static/js + cp -L web/static/js/*.min.js $(DIST_PATH)/web/static/js/ + cp -RL web/static/config $(DIST_PATH)/web/static + cp -RL web/static/css $(DIST_PATH)/web/static + cp -RL web/static/fonts $(DIST_PATH)/web/static + cp -RL web/static/help $(DIST_PATH)/web/static + cp -RL web/static/images $(DIST_PATH)/web/static + cp -RL web/static/js/jquery-dragster $(DIST_PATH)/web/static/js/ cp -RL web/templates $(DIST_PATH)/web mkdir -p $(DIST_PATH)/api |