From 27e63e01cce368d67092de8f0c736927d6f6aa69 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Fri, 1 May 2020 14:27:57 -0400 Subject: build: Accomodate makensis v2.x Apparently the -X flag doesn't work as expected in makensis v2.x For example: makensis -V2 share/setup.nsi -X'OutFile "test.exe"' Will output: OutFile expects 1 parameters, got 0. Usage: OutFile install_output.exe So let's instead construct the file using POSIX-compliant commands and shell constructs --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1c39f1940c..43790f1c23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release - @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi -X'OutFile "$@"' || \ + @test -f $(MAKENSIS) && echo 'OutFile "$@"' | cat $(top_builddir)/share/setup.nsi - | $(MAKENSIS) -V2 - || \ echo error: could not build $@ @echo built $@ -- cgit v1.2.3