]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Generate the NSIS installer when building on MSYS2/MinGW
authorMarios Paouris <mspaourh@gmail.com>
Fri, 19 Jul 2024 05:36:16 +0000 (08:36 +0300)
committerMarios Paouris <mspaourh@gmail.com>
Fri, 19 Jul 2024 05:36:16 +0000 (08:36 +0300)
When building under MSYS2/MinGW generate windows-style paths for instfiles.nsh
as makensis on windows expects them that way.

Signed-off-by: Marios Paouris <mspaourh@gmail.com>
Makefile.am

index e7ead12e9c39262dd3fed794a3e329ce2eb51d84..a12798a49c0c298f0462d035535f68781d97c807 100644 (file)
@@ -469,7 +469,7 @@ file-list-extra.txt:
 # just emit raw snippets to be included separately in the install
 # and uninstall sections.
 instfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt file-list-extra.txt
-       $(AM_V_GEN) ( grep -hv "^$(libdir)/qt5/plugins" $^ | sed 's%\(.*\)%File "\1"%' ; \
+       $(AM_V_GEN) ( for f in `grep -hv "^$(libdir)/qt5/plugins" $^`; do g=`$(CYGPATH_W) $$f`; echo File \"$$g\"; done; \
        grep -h "^$(libdir)/qt5/plugins" $^ | sed 's%\(.*/qt5/plugins\)/\([^/]*\)/\([^/]*\)%SetOutPath "$$INSTDIR\\\\\2"\nFile "\1/\2/\3"%' ) > $@
 
 uninstfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt file-list-extra.txt