From 0050bf005a40cab3b4fdc43f2960025e8d52e176 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 11 Aug 2020 19:22:48 +0530
Subject: adjust path

---
 build-system/Makefile | 8 ++------
 contrib/devrelease.sh | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build-system/Makefile b/build-system/Makefile
index 82c32c4f2..f04461959 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -36,8 +36,8 @@ check: compile
 	pnpm run check
 
 .PHONY: webextensions
-webextensions: rollup
-	./webextension/pack.sh
+webextension: compile
+	cd ./packages/taler-wallet-webextension/ && ./pack.sh
 
 .PHONY: integrationtests
 integrationtests: compile
@@ -84,10 +84,6 @@ install: compile
 	ln -sft $(prefix)/bin $(install_target)/node_modules/taler-wallet-cli/bin/taler-wallet-cli
 endif
 
-.PHONY: rollup
-rollup: compile
-	./node_modules/.bin/rollup -c
-
 .PHONY: lint
 lint:
 	./node_modules/.bin/eslint --ext '.js,.ts,.tsx' 'src'
diff --git a/contrib/devrelease.sh b/contrib/devrelease.sh
index 734722568..72b059a01 100755
--- a/contrib/devrelease.sh
+++ b/contrib/devrelease.sh
@@ -8,15 +8,15 @@ devtag=$1
 
 git tag $devtag || true
 
-make rollup
+make compile
 
 if [[ ! -d prebuilt ]]; then
-  git worktree add prebuilt
+  git worktree add -f prebuilt prebuilt
 fi
 
 mkdir -p prebuilt/$devtag
 
-cp dist/standalone/taler-wallet-android.js prebuilt/$devtag/
+cp packages/taler-wallet-android/dist/taler-wallet-android.js prebuilt/$devtag/
 cd prebuilt
 git add -A $devtag
 git commit -m "prebuilt files for $devtag" || true
-- 
cgit v1.2.3