Skip to content

Commit fa791da

Browse files
committed
nsis: Specify OutFile path only once
Previously, we would specify the makensis output file path twice: 1. At the top of Makefile.am as BITCOIN_WIN_INSTALLER, and 2. In share/setup.nsi.ini This commit uses the -X flag of makensis to eliminate the need for the second instance mentioned above, referring makensis directly to the value of BITCOIN_WIN_INSTALLER
1 parent 1470160 commit fa791da

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
8080
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
8181
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
8282
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release
83-
@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
83+
@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi -X'OutFile "$@"' || \
8484
echo error: could not build $@
8585
@echo built $@
8686

share/setup.nsi.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ Var StartMenuGroup
5151
!insertmacro MUI_LANGUAGE English
5252

5353
# Installer attributes
54-
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@[email protected]
5554
InstallDir $PROGRAMFILES64\Bitcoin
5655
CRCCheck on
5756
XPStyle on

0 commit comments

Comments
 (0)