Make dev depend on build

[github/wallabag/wallabag.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index d8c16202848e091db22d4e65409125e443db0692..15d737db5099c13e0095179177d8efaf7271e849 100755 (executable)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,21 +16,17 @@ 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-travis-pg: ## Custom prepare for Travis & Postgres (do not drop/create the database)
-ifdef DB
-       cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-       php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
 prepare: clean ## Prepare database for testsuite
 ifdef DB
        cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml