diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
commit | 4949b6837f1a2ef103f58659c7692f01378128f7 (patch) | |
tree | 5d53313029624492c15888345167a4146d1ea918 /Makefile | |
parent | 6aff5900f79721783599a7ab9fe29074e4050544 (diff) | |
parent | f55416d9f45afcb310246426366cd261f138029f (diff) | |
download | chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.gz chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.bz2 chat-4949b6837f1a2ef103f58659c7692f01378128f7.zip |
Merge branch 'master' into typos
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 |