Skip to content

Commit 0dbf6e4

Browse files
theuniJeremyRand
authored andcommitted
build: define base filenames for use elsewhere in the buildsystem
Unfortunately, the target namees defined at the Makefile.am level can't be used for *.in substitution. So these new defines will have to stay synced up with those targets. Using the new variables for the deploy targets in the main Makefile.am will ensure that they stay in sync, otherwise build tests will fail.
1 parent 065c6b4 commit 0dbf6e4

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ pkgconfigdir = $(libdir)/pkgconfig
1010
pkgconfig_DATA = libbitcoinconsensus.pc
1111
endif
1212

13-
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
14-
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
15-
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
13+
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
14+
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
15+
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
1616
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
1717

1818
empty :=

configure.ac

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
1414
AC_CONFIG_AUX_DIR([build-aux])
1515
AC_CONFIG_MACRO_DIR([build-aux/m4])
1616

17+
BITCOIN_DAEMON_NAME=bitcoind
18+
BITCOIN_GUI_NAME=bitcoin-qt
19+
BITCOIN_CLI_NAME=bitcoin-cli
20+
BITCOIN_TX_NAME=bitcoin-tx
21+
1722
AC_CANONICAL_HOST
1823

1924
AH_TOP([#ifndef BITCOIN_CONFIG_H])
@@ -1019,6 +1024,10 @@ AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
10191024
AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
10201025
AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
10211026
AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
1027+
AC_SUBST(BITCOIN_DAEMON_NAME)
1028+
AC_SUBST(BITCOIN_GUI_NAME)
1029+
AC_SUBST(BITCOIN_CLI_NAME)
1030+
AC_SUBST(BITCOIN_TX_NAME)
10221031

10231032
AC_SUBST(RELDFLAGS)
10241033
AC_SUBST(HARDENED_CXXFLAGS)

0 commit comments

Comments
 (0)