diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-06 07:23:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-06 08:04:20 +0200 |
| commit | 71c0e80e7e9a3be015a0e91616778698051a0785 (patch) | |
| tree | 63e413662875b7abbff65408454b20ea5625a521 /src/m4 | |
| parent | 5795aaca26d23d315f80ee0b45f1e1fa939e5cfd (diff) | |
| parent | efe6888407186b8a468f357fa7084c0a8c3de503 (diff) | |
| download | bitcoin-71c0e80e7e9a3be015a0e91616778698051a0785.tar.xz | |
Merge pull request #4241
efe6888 build: fix version dependency (Cory Fields)
f4d8112 build: quit abusing AM_CPPFLAGS (Cory Fields)
56c157d build: avoid the use of top_ and abs_ dir paths (Cory Fields)
70c71c5 build: Tidy up file generation output (Cory Fields)
6b9f0d5 build: nuke Makefile.include from orbit (Cory Fields)
8b09ef7 build: add stub makefiles for easier subdir builds (Cory Fields)
be4e9ae build: delete old Makefile.am's (Cory Fields)
65e8ba4 build: Switch to non-recursive make (Cory Fields)
Diffstat (limited to 'src/m4')
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index e71ecd7172..244b03a5c2 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -100,7 +100,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path) BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes) - MOC_DEFS='-DHAVE_CONFIG_H -I$(top_srcdir)/src' + MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)' case $host in *darwin*) BITCOIN_QT_CHECK([ |