[checkmk-commits] Handle spaces in paths more gracefully

Module: check_mk Branch: master Commit: ca717be305c4a8c69b3a1c2cb097f2c0bdb83291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca717be305c4a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 16 17:29:03 2017 +0100 Handle spaces in paths more gracefully Change-Id: I7827a2e16dbc0ea02a8aee5dc74b860459d2df88 --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fa17f03..eb97640 100644 --- a/Makefile +++ b/Makefile @@ -408,18 +408,22 @@ config.status: ar-lib compile config.guess config.sub install-sh missing depcomp echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ else \ - if test -d $(abspath ../boost/local) ; then \ + if test -d ../boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \ - elif test -d $(abspath ../cmk-omd/packages/boost/local) ; then \ + elif test -d ../cmk-omd/packages/boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../cmk-omd/packages/boost/local)" ; \ elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ else \ - BOOST_OPT="" ; \ + BOOST_OPT="DUMMY1=" ; \ fi ; \ - RRD_OPT="$(shell test -d ../rrdtool/rrdtool-1.5.4/src/.libs && echo LDFLAGS="-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)")" ; \ - echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" $$BOOST_OPT $$RRD_OPT" ; \ - ./configure CXXFLAGS="$(CXX_FLAGS)" $$BOOST_OPT $$RRD_OPT ; \ + if test -d "../rrdtool/rrdtool-1.5.4/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)" ; \ + else \ + RRD_OPT="DUMMY2=" ; \ + fi ; \ + echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$BOOST_OPT\" \"$$RRD_OPT\"" ; \ + ./configure CXXFLAGS="$(CXX_FLAGS)" "$$BOOST_OPT" "$$RRD_OPT" ; \ fi configure: $(CONFIGURE_DEPS)