diff options
| author | Matt Corallo <git@bluematt.me> | 2012-10-28 17:38:22 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2012-10-29 15:43:17 -0400 |
| commit | 3b4f8ad71dfdd98d7a8066af616f7973125ad6e2 (patch) | |
| tree | e938943df9fe794a1c06b79a58e2f9736b118fe1 /bitcoin-qt.pro | |
| parent | c13f5dbecf2bc22e81ad847f0cf4b1bf632cdd8d (diff) | |
| download | bitcoin-3b4f8ad71dfdd98d7a8066af616f7973125ad6e2.tar.xz | |
Use && instead of ; in leveldb calls to makefile.
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index cd9755e8fa..9f24b55186 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -95,13 +95,13 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { INCLUDEPATH += src/leveldb/include src/leveldb/helpers LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a !windows { - genleveldb.commands = cd $$PWD/src/leveldb ; $(MAKE) libleveldb.a libmemenv.a + genleveldb.commands = cd $$PWD/src/leveldb && $(MAKE) libleveldb.a libmemenv.a } else { # make an educated guess about what the ranlib command is called isEmpty(QMAKE_RANLIB) { QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) } - genleveldb.commands = cd $$PWD/src/leveldb ; CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$$BOOST_INCLUDE_PATH" LDFLAGS="-L$$BOOST_LIB_PATH" $(MAKE) libleveldb.a libmemenv.a ; $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a ; $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$$BOOST_INCLUDE_PATH" LDFLAGS="-L$$BOOST_LIB_PATH" $(MAKE) libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a } genleveldb.target = $$PWD/src/leveldb/libleveldb.a genleveldb.depends = FORCE |