summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoranoy <anoymouserver+github@mailbox.org>2023-11-04 21:36:30 +0100
committerBenjamin Brahmer <info@b-brahmer.de>2023-11-07 14:15:44 +0100
commite5a4f6a005f155caabd1328aeed241a3424ecd2c (patch)
tree4edc7308a98d4daf18e0a28d07ee3cb444a0d4d0 /Makefile
parent35a6018ea5c58ccacffc1a8d403354056535ffd6 (diff)
fix merge errors
- js build was run twice - engines were defined twice Signed-off-by: anoy <anoymouserver+github@mailbox.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e4f10f421..c59e3b9ea 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,8 @@ endif
# Installs npm dependencies
.PHONY: npm
npm:
- $(npm) ci
- $(npm) run build
ifneq (, $(npm))
+ $(npm) ci
$(npm) run build
else
@echo "npm command not available, please install nodejs first"