From: Olivier Mehani <shtrom@ssji.net>
Date: Thu, 29 Aug 2019 11:27:56 +0000 (+1000)
Subject: Make dev depend on build
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b1574a39877d69cdf54111b0fb108039c21eae5f;hp=e337267d7617cf7e53e72c2cfc4125d37e0235fc;p=github%2Fwallabag%2Fwallabag.git

Make dev depend on build

Also, run `npm install` before building.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
---

diff --git a/GNUmakefile b/GNUmakefile
index a04468cb..15d737db 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,13 +16,15 @@ install: ## Install wallabag with the latest version
 update: ## Update the wallabag installation to the latest version
 	@./scripts/update.sh $(ENV)
 
-dev: ## Install the latest dev version
+dev: ENV=dev
+dev: build ## Install the latest dev version
 	@./scripts/dev.sh
 
 run: ## Run the wallabag built-in server
 	@php bin/console server:run --env=dev
 
 build: ## Run webpack
+	@npm install
 	@npm run build:$(ENV)
 
 prepare: clean ## Prepare database for testsuite