From 30c6cf636c184373596eb8e205a10dec71677ca7 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 23:49:00 -0800 Subject: [PATCH] make path replace portable --- bootstrap.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index fa2740bd3..c824358c0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -73,6 +73,11 @@ function make_config() { export CPLUS_INCLUDE_PATH="${MASON_LINKED_REL}/include" export LIBRARY_PATH="${MASON_LINKED_REL}/lib" export PATH="${MASON_LINKED_REL}/bin":${PATH} + if [[ $(uname -s) == 'Darwin' ]]; then + export PATH_REPLACE="/Users/travis/build/mapbox/mason/mason_packages:./mason_packages" + else + export PATH_REPLACE="/home/travis/build/mapbox/mason/mason_packages:./mason_packages" + fi echo " CXX = '$CXX' @@ -84,7 +89,7 @@ INPUT_PLUGINS = 'all' PATH = '${MASON_LINKED_REL}/bin' PKG_CONFIG_PATH = '${MASON_LINKED_REL}/lib/pkgconfig' PATH_REMOVE = '/usr:/usr/local' -PATH_REPLACE = '/Users/travis/build/mapbox/mason/mason_packages:./mason_packages' +PATH_REPLACE = '${PATH_REPLACE}' BOOST_INCLUDES = '${MASON_LINKED_REL}/include' BOOST_LIBS = '${MASON_LINKED_REL}/lib' ICU_INCLUDES = '${MASON_LINKED_REL}/include'