diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | share/setup.nsi.in | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 98e3fef051..639c60a3c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ GZIP_ENV="-9n" BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT) BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) +BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) OSX_APP=Bitcoin-Qt.app @@ -40,20 +41,17 @@ distcheck-hook: distcleancheck: @: -$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) +$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN) $(MAKE) distdir $(MKDIR_P) $(top_builddir)/release - $(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/bitcoind$(EXEEXT) $(top_builddir)/release - $(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) $(top_builddir)/release + $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release + $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release + $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release @test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ -$(BITCOIND_BIN): - make -C $(top_srcdir)/src bitcoind$(EXEEXT) - -$(BITCOIN_QT_BIN): - make -C $(top_srcdir)/src/qt bitcoin-qt$(EXEEXT) - +$(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN): + make -C $(dir $@) $(notdir $@) $(OSX_APP)/Contents/PkgInfo: $(MKDIR_P) $(@D) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index d29d957154..603f9124a2 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -78,6 +78,7 @@ Section -Main SEC0000 File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt SetOutPath $INSTDIR\daemon File @abs_top_srcdir@/release/bitcoind.exe + File @abs_top_srcdir@/release/bitcoin-cli.exe SetOutPath $INSTDIR\src File /r @abs_top_srcdir@/@PACKAGE@-@VERSION@/src\*.* SetOutPath $INSTDIR |