From 552155c82616bc7d6148738f01c3f9a2d47e8e4d Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 28 Sep 2023 18:42:14 +0200
Subject: [PATCH] -symlinks

---
 packages/anastasis-cli/Makefile    | 18 +++++++++---------
 packages/taler-harness/Makefile    | 20 ++++++++++----------
 packages/taler-wallet-cli/Makefile | 22 +++++++++++-----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/anastasis-cli/Makefile b/packages/anastasis-cli/Makefile
index de6c92a7b..724a5e40d 100644
--- a/packages/anastasis-cli/Makefile
+++ b/packages/anastasis-cli/Makefile
@@ -21,19 +21,19 @@ warn-noprefix:
 	@echo "no prefix configured, did you run ./configure?"
 install: warn-noprefix
 else
-bindir = $(DESTDIR)$(prefix)/bin
-libdir = $(DESTDIR)$(prefix)/lib/anastasis-cli
+bindir = $(prefix)/bin
+libdir = $(prefix)/lib/anastasis-cli
 nodedir = $(libdir)/node_modules/anastasis-cli
 .PHONY: install install-nodeps deps
 install-nodeps:
 	./build-node.mjs
-	install -d $(bindir)
-	install -d $(nodedir)/bin
-	install -d $(nodedir)/dist
-	install ./dist/anastasis-cli-bundled.cjs $(nodedir)/dist/
-	install ./dist/anastasis-cli-bundled.cjs.map $(nodedir)/dist/
-	install ./bin/anastasis-cli.mjs $(nodedir)/bin/
-	ln -sf $(nodedir)/bin/anastasis-cli.mjs $(bindir)/anastasis-cli
+	install -d $(DESTDIR)$(bindir)
+	install -d $(DESTDIR)$(nodedir)/bin
+	install -d $(DESTDIR)$(nodedir)/dist
+	install ./dist/anastasis-cli-bundled.cjs $(DESTDIR)$(nodedir)/dist/
+	install ./dist/anastasis-cli-bundled.cjs.map $(DESTDIR)$(nodedir)/dist/
+	install ./bin/anastasis-cli.mjs $(DESTDIR)$(nodedir)/bin/
+	ln -sf ../lib/anastasis-cli/node_modules/anastasis-cli/bin/anastasis-cli.mjs $(DESTDIR)$(bindir)/anastasis-cli
 deps:
 	pnpm install --frozen-lockfile --filter @gnu-taler/anastasis-cli...
 install:
diff --git a/packages/taler-harness/Makefile b/packages/taler-harness/Makefile
index f9967419d..f8bad0f99 100644
--- a/packages/taler-harness/Makefile
+++ b/packages/taler-harness/Makefile
@@ -21,20 +21,20 @@ warn-noprefix:
 	@echo "no prefix configured, did you run ./configure?"
 install: warn-noprefix
 else
-BINDIR = $(DESTDIR)$(prefix)/bin
-LIBDIR = $(DESTDIR)$(prefix)/lib/taler-harness
+BINDIR = $(prefix)/bin
+LIBDIR = $(prefix)/lib/taler-harness
 NODEDIR = $(LIBDIR)/node_modules/taler-harness
 .PHONY: install deps install-nodeps
 install-nodeps:
 	./build.mjs
-	install -d $(BINDIR)
-	install -d $(NODEDIR)
-	install -d $(NODEDIR)/bin
-	install -d $(NODEDIR)/dist
-	install ./dist/taler-harness-bundled.cjs $(NODEDIR)/dist/
-	install ./dist/taler-harness-bundled.cjs.map $(NODEDIR)/dist/
-	install ./bin/taler-harness.mjs $(NODEDIR)/bin/
-	ln -sf $(NODEDIR)/bin/taler-harness.mjs $(BINDIR)/taler-harness
+	install -d $(DESTDIR)$(BINDIR)
+	install -d $(DESTDIR)$(NODEDIR)
+	install -d $(DESTDIR)$(NODEDIR)/bin
+	install -d $(DESTDIR)$(NODEDIR)/dist
+	install ./dist/taler-harness-bundled.cjs $(DESTDIR)$(NODEDIR)/dist/
+	install ./dist/taler-harness-bundled.cjs.map $(DESTDIR)$(NODEDIR)/dist/
+	install ./bin/taler-harness.mjs $(DESTDIR)$(NODEDIR)/bin/
+	ln -sf ../lib/taler-harness/node_modules/taler-harness/bin/taler-harness.mjs $(DESTDIR)$(BINDIR)/taler-harness
 deps:
 	pnpm install --frozen-lockfile --filter @gnu-taler/taler-harness...
 install:
diff --git a/packages/taler-wallet-cli/Makefile b/packages/taler-wallet-cli/Makefile
index 6bfe05fc5..229fb3547 100644
--- a/packages/taler-wallet-cli/Makefile
+++ b/packages/taler-wallet-cli/Makefile
@@ -21,23 +21,23 @@ warn-noprefix:
 	@echo "no prefix configured, did you run ./configure?"
 install: warn-noprefix
 else
-LIBDIR = $(DESTDIR)$(prefix)/lib/taler-wallet-cli
-BINDIR=$(DESTDIR)$(prefix)/bin
+LIBDIR = $(prefix)/lib/taler-wallet-cli
+BINDIR=$(prefix)/bin
 NODEDIR=$(LIBDIR)/node_modules/taler-wallet-cli
 .PHONY: install install-nodeps deps
 install-nodeps:
 	./build-node.mjs
 	@echo installing wallet CLI to $(DESTDIR)$(prefix)
-	install -d $(BINDIR)
-	install -d $(LIBDIR)/build
-	install -d $(NODEDIR)/bin
-	install -d $(NODEDIR)/dist
-	install ./dist/taler-wallet-cli-bundled.cjs $(NODEDIR)/dist/
-	install ./dist/taler-wallet-cli-bundled.cjs.map $(NODEDIR)/dist/
-	install ./bin/taler-wallet-cli.mjs $(NODEDIR)/bin/
-	install ../idb-bridge/node_modules/better-sqlite3/build/Release/better_sqlite3.node $(LIBDIR)/build/ \
+	install -d $(DESTDIR)$(BINDIR)
+	install -d $(DESTDIR)$(LIBDIR)/build
+	install -d $(DESTDIR)$(NODEDIR)/bin
+	install -d $(DESTDIR)$(NODEDIR)/dist
+	install ./dist/taler-wallet-cli-bundled.cjs $(DESTDIR)$(NODEDIR)/dist/
+	install ./dist/taler-wallet-cli-bundled.cjs.map $(DESTDIR)$(NODEDIR)/dist/
+	install ./bin/taler-wallet-cli.mjs $(DESTDIR)$(NODEDIR)/bin/
+	install ../idb-bridge/node_modules/better-sqlite3/build/Release/better_sqlite3.node $(DESTDIR)$(LIBDIR)/build/ \
 		|| echo "sqlite3 unavailable, better-sqlite3 native module not found"
-	ln -sf $(NODESIR)/bin/taler-wallet-cli.mjs $(BINDIR)/taler-wallet-cli
+	ln -sf ../lib/taler-wallet-cli/node_modules/taler-wallet-cli/bin/taler-wallet-cli.mjs $(DESTDIR)$(BINDIR)/taler-wallet-cli
 deps:
 	pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli...
 	pnpm run --filter @gnu-taler/taler-wallet-cli... compile