diff options
| author | Louie Shprung <lshprung@tutanota.com> | 2024-08-30 17:52:48 -0400 |
|---|---|---|
| committer | Louie Shprung <lshprung@tutanota.com> | 2024-08-30 17:52:48 -0400 |
| commit | 49d7691f6fb374ae2f06f46ead21d53c14bc64b9 (patch) | |
| tree | c9a8ed0084cb275e55157cb02e35c36feeab4bd2 /nsis/Makefile.am | |
| parent | 8971585bebcb46d72dd0cfdaf98dd9b4b9a6f27e (diff) | |
Improve dependency locating
Diffstat (limited to 'nsis/Makefile.am')
| -rw-r--r-- | nsis/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
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 |