Module: check_mk
Branch: master
Commit: 78d71a8d79a57f245389eb9eaf77796a0f0ecfcd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78d71a8d79a57f…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jan 18 09:30:48 2018 +0100
Fixed path to temporary Boost installation.
We should really include Makefile.omd in our toplevel Makefile, the amount
of copy-n-paste is way too high... :-/
Change-Id: Ie5e12035907734bc0b9bdb71f2904a20c19d7736
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 989130b..c0e227a 100644
--- a/Makefile
+++ b/Makefile
@@ -416,10 +416,10 @@ config.status: $(DIST_DEPS)
echo "update config.status by reconfiguring in the same conditions" ; \
./config.status --recheck; \
else \
- if test -d ../boost/local ; then \
- BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \
- elif test -d omd/packages/boost/local ; then \
- BOOST_OPT="--with-boost=$(abspath omd/packages/boost/local)" ; \
+ if test -d ../boost/destdir ; then \
+ BOOST_OPT="--with-boost=$(abspath ../boost/destdir)" ; \
+ elif test -d omd/packages/boost/destdir ; then \
+ BOOST_OPT="--with-boost=$(abspath omd/packages/boost/destdir)" ; \
elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \
BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \
else \