Another slight update so that latest only builds from master

This commit is contained in:
Blake Thompson 2015-04-29 08:51:22 -05:00
parent e12d53ba79
commit 54b05800d9
2 changed files with 3 additions and 2 deletions

View file

@ -41,6 +41,7 @@ matrix:
before_install:
- export COVERAGE=${COVERAGE:-false}
- export MASON_PUBLISH=${MASON_PUBLISH:-false}
- if [[ ${TRAVIS_BRANCH} != 'master' ]]; then export MASON_PUBLISH=false; fi;
install:
- if [[ $(uname -s) == 'Linux' ]]; then

View file

@ -14,8 +14,8 @@ function mason_compile {
HERE=$(pwd)
make install
if [ $UNAME = 'Darwin' ]; then
install_name_tool -id @loader_path/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib"
fi
install_name_tool -id @loader_path/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib";
fi;
python -c "data=open('$MASON_PREFIX/bin/mapnik-config','r').read();open('$MASON_PREFIX/bin/mapnik-config','w').write(data.replace('$HERE','.'))"
mkdir -p ${MASON_PREFIX}/share/gdal
mkdir -p ${MASON_PREFIX}/share/proj