From 0be55e35d19ade68a188e7c6df3855156a20fa05 Mon Sep 17 00:00:00 2001 From: Alan Westbrook Date: Sat, 25 Jan 2014 16:42:02 -0800 Subject: [PATCH] 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 --- dogecoin-qt.pro | 20 ++++++++++++++------ src/makefile.osx | 10 ++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dogecoin-qt.pro b/dogecoin-qt.pro index 4080d14c2..4eabeed42 100644 --- a/dogecoin-qt.pro +++ b/dogecoin-qt.pro @@ -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 diff --git a/src/makefile.osx b/src/makefile.osx index 368f70623..efa0d3996 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -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