From 49d7691f6fb374ae2f06f46ead21d53c14bc64b9 Mon Sep 17 00:00:00 2001
From: Louie Shprung <lshprung@tutanota.com>
Date: Fri, 30 Aug 2024 17:52:48 -0400
Subject: Improve dependency locating

---
 nsis/Makefile.am | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'nsis/Makefile.am')

diff --git a/nsis/Makefile.am b/nsis/Makefile.am
index 72f8ab9..8eead42 100644
--- a/nsis/Makefile.am
+++ b/nsis/Makefile.am
@@ -1,13 +1,12 @@
-EXTRA_DIST = find_dlls.sh installer.nsi.in
+EXTRA_DIST = installer.nsi.in
 
-CLEANFILES = $(PACKAGE_NAME)-Setup.exe deps/*
+CLEANFILES = *Setup.exe deps/*
 
 SEARCHPATH=$$PATH
-DEPENDENCIES = $(shell ./find_dlls.sh -q -s $(SEARCHPATH) '../src/$(PACKAGE_NAME).exe')
+DLLS = $(shell ntldd -R ../src/$(PACKAGE_NAME).exe | sed 's/.*=> //g' | grep -v "not found" | sed 's/ (.*)$$//g' | sed 's/\\/\\\\/g' | xargs cygpath -u | grep "$$MINGW_PREFIX")
 
 .PHONY: installer
-installer: $(PACKAGE_NAME)-Setup.exe
-$(PACKAGE_NAME)-Setup.exe: installer.nsi
+installer: installer.nsi
 	mkdir -p deps
-	for file in $(DEPENDENCIES); do install "$$file" "deps/$$(basename "$$file")"; done
+	for file in $(DLLS); do install "$$file" "deps/$$(basename "$$file")"; done
 	makensis installer.nsi
-- 
cgit