diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2016-02-04 13:29:54 +0300 |
|---|---|---|
| committer | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2016-02-04 13:29:54 +0300 |
| commit | 6fa4b8fcef29c553077ab20e6a00972fdfcf529e (patch) | |
| tree | 25822eb529ebb803a654c090e4c081ecd83d5571 /Makefile | |
| parent | 1987f2e98602e0507c696406e5e5f9238d2d3ae8 (diff) | |
| parent | c1dd4e8854b320f5f59830232d6206962e172d73 (diff) | |
Merge pull request #1222 from owncloud/fix-makefile-dependencies
remove cyclic dependency from Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ install-npm-deps-dev: install-bower-deps: bower.json install-npm-deps ./node_modules/bower/bin/bower install -optimize-js: install-deps +optimize-js: install-npm-deps install-bower-deps ./node_modules/requirejs/bin/r.js -o build.js dev-setup: install-composer-deps install-npm-deps-dev install-bower-deps |