summaryrefslogtreecommitdiffstats
path: root/settings/Makefile
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-04-24 09:40:05 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-16 09:50:22 +0200
commitf4cec587d972b751a5a3cea44e11804e100ff329 (patch)
treee9e5ccd991c6397244f1f9d371ee6b1d9a29c85d /settings/Makefile
parentf0586b2eb15651e358b6ebf47b230bc7965dde35 (diff)
downloadnextcloud-server-f4cec587d972b751a5a3cea44e11804e100ff329.tar.gz
nextcloud-server-f4cec587d972b751a5a3cea44e11804e100ff329.zip
Bump makefile, readme, fix typo and cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/Makefile')
-rw-r--r--settings/Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/settings/Makefile b/settings/Makefile
index 5fa7fa5650b..98e1f89b384 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -1,9 +1,11 @@
-all: clean npm-update build-js-production
+all: dev-setup build-js-production
-dev-setup: clean npm-update build-js
+dev-setup: clean clean-dev npm-init
+
+npm-init:
+ npm install
npm-update:
- rm -rf node_modules
npm update
build-js:
@@ -16,6 +18,9 @@ watch-js:
npm run watch
clean:
- rm js/main.js
- rm js/main.js.map
+ rm -f js/main.js
+ rm -f js/main.js.map
+
+clean-dev:
+ rm -rf node_modules