Merge branch '17526-3rd-party-access-ui' into main. Closes #17526

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index de88cd3548cbc04be68900fa0b5ce8fecbb00c3c..3df3c78ce1f9e9c7f8708fad65e9ffbc081511b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+TARGETS?=centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004
 
 ARVADOS_DIRECTORY?=unset
 
@@ -25,7 +25,7 @@ DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
 # DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/arvados-workbench2/workbench2/
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
 
 # Debian package file
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
@@ -59,7 +59,15 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-yarn-install:
+arvados-server-install:
+       cd $(ARVADOS_DIRECTORY)
+       go mod download
+       cd cmd/arvados-server
+       go install
+       cd -
+       ~/go/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
        yarn install
 
 unit-tests: yarn-install