home-brew and macports checking extravaganza
Update the pro file to check for port v brew Fix the makefile.osx check bug Some formatting fixes
This commit is contained in:
parent
007f0f7f73
commit
0be55e35d1
|
@ -101,24 +101,32 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
|
|||
|
||||
macx: {
|
||||
|
||||
isEmpty(DEPS_DIR) {
|
||||
DEPSDIR=/usr/local
|
||||
isEmpty(DEPSDIR) {
|
||||
|
||||
check_dir = /usr/local/Cellar
|
||||
exists($$check_dir) {
|
||||
DEPSDIR = /usr/local
|
||||
}
|
||||
|
||||
!exists($$check_dir) {
|
||||
DEPSDIR = /opt/local
|
||||
}
|
||||
}
|
||||
|
||||
isEmpty(BOOST_LIB_PATH) {
|
||||
BOOST_LIB_PATH=$$DEPSDIR/lib
|
||||
BOOST_LIB_PATH = $$DEPSDIR/lib
|
||||
}
|
||||
|
||||
isEmpty(BOOST_INCLUDE_PATH) {
|
||||
BOOST_INCLUDE_PATH=$$DEPSDIR/include
|
||||
BOOST_INCLUDE_PATH = $$DEPSDIR/include
|
||||
}
|
||||
|
||||
isEmpty(BDB_LIB_PATH) {
|
||||
BDB_LIB_PATH=$$DEPSDIR/lib
|
||||
BDB_LIB_PATH = $$DEPSDIR/lib
|
||||
}
|
||||
|
||||
isEmpty(BDB_INCLUDE_PATH) {
|
||||
BDB_INCLUDE_PATH=$$DEPSDIR/include
|
||||
BDB_INCLUDE_PATH = $$DEPSDIR/include
|
||||
}
|
||||
|
||||
HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
|
||||
|
|
|
@ -7,16 +7,14 @@
|
|||
# Mac OS X makefile for Dogecoin
|
||||
# Originally by Laszlo Hanyecz (solar@heliacal.net)
|
||||
|
||||
STATIC=yes
|
||||
CXX=c++
|
||||
|
||||
MACPORTSDIR=$(wildcard /opt/local)
|
||||
HOMEBREWDIR=$(wildcard /usr/local/Cellar)
|
||||
CHECKDIR=$(wildcard /usr/local/Cellar)
|
||||
|
||||
ifneq ($(HOMEBREWDIR),)
|
||||
DEPSDIR=$(HOMEBREWDIR)
|
||||
ifneq ($(CHECK_DIR),)
|
||||
DEPSDIR=/usr/local
|
||||
else
|
||||
DEPSDIR=$(MACPORTSDIR)
|
||||
DEPSDIR=/opt/local
|
||||
endif
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue