From d79c2777c75b9e5e1d566960e2ed98e1a0e41449 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 14 Oct 2019 22:39:12 +0530
Subject: build system

---
 Makefile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 622227316..31142ede5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ava = node_modules/ava/cli.js
 nyc = node_modules/nyc/bin/nyc.js
 tslint = node_modules/tslint/bin/tslint
 
--include config.mk
+include config.mk
 
 .PHONY: tsc
 tsc: tsconfig.json yarn-install
@@ -39,10 +39,8 @@ typedoc:
 clean:
 	rm -rf dist/ config.mk
 
-submodules/init:
-	git submodule update --init --recursive
-
-submodules/update:
+.PHONY: submodules-update
+submodules-update:
 	git submodule update --recursive --remote
 
 .PHONY: check
@@ -59,7 +57,7 @@ lint: tsc yarn-install
 
 .PHONY: yarn-install
 yarn-install:
-	$(yarnexe) install
+	$(yarn) install
 
 
 .PHONY: i18n
@@ -89,10 +87,9 @@ else
 .PHONY: install
 install: tsc
 	@echo "installing to" $(prefix)
-	yarn global add file://$(CURDIR) --prefix $(prefix)
+	$(yarn) global add file://$(CURDIR) --prefix $(prefix)
 endif
 
 .PHONY: watch
 watch: tsconfig.json
-
 	./node_modules/.bin/webpack --watch
-- 
cgit v1.2.3