Skip to content

Commit b6b7815

Browse files
committed
Merge bitcoin#24277: build: Fix make deploy for Windows when building out of source tree
a5f67b4 build: Fix `make deploy` for Windows when building out of source tree (Hennadii Stepanov) Pull request description: On master (1e7564e): ``` $ make distclean $ mkdir ../build $ cd ../build $ CONFIG_SITE=$PWD/../bitcoin/depends/x86_64-w64-mingw32/share/config.site ../bitcoin/configure $ make $ make deploy ... File: "/home/hebasto/GitHub/build/../bitcoin/release/bitcoin-qt.exe" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=outfile one_file_only) Error in script "<stdin>" on line 75 -- aborting creation process error: could not build bitcoin-22.99.0-win64-setup.exe built bitcoin-22.99.0-win64-setup.exe ``` This PR fixes this bug. ACKs for top commit: laanwj: Code review ACK a5f67b4 Tree-SHA512: 7ac2f15cdc433fe509f2392d08a3c611b190a11ff92f718902cf9e25cfb9515f3840f4ddf2b1bfb8a1090e85773e671405c838cbe2b970205a12c20ebaf645bd
2 parents 3bb9394 + a5f67b4 commit b6b7815

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

share/setup.nsi.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ ShowUninstDetails show
7272
Section -Main SEC0000
7373
SetOutPath $INSTDIR
7474
SetOverwrite on
75-
File @abs_top_srcdir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
75+
File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
7676
File /oname=COPYING.txt @abs_top_srcdir@/COPYING
7777
File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
7878
SetOutPath $INSTDIR\daemon
79-
File @abs_top_srcdir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
80-
File @abs_top_srcdir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
81-
File @abs_top_srcdir@/release/@BITCOIN_TX_NAME@@EXEEXT@
82-
File @abs_top_srcdir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
79+
File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
80+
File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
81+
File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@
82+
File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
8383
SetOutPath $INSTDIR\doc
8484
File /r /x Makefile* @abs_top_srcdir@/doc\*.*
8585
SetOutPath $INSTDIR

0 commit comments

Comments
 (0)