more travis build changes

.travis.yml

@@ -5,8 +5,9 @@ compiler:
  - clang
 
 cache:
-    directories:
-    - mapnik-packaging
+- apt
+- directories:
+  - mapnik-packaging
 
 before_install:
 - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test

setup-libraries.sh

@@ -15,7 +15,7 @@ elif [ ${UNAME} = 'Linux' ]; then
     fi
 fi
 
-if [ ! -d 'mapnik-packaging' ]; then
+if [ ! -d 'mapnik-packaging/.git' ]; then
   git clone --depth=1 https://github.com/mapnik/mapnik-packaging.git
 fi
 
@@ -54,6 +54,8 @@ source MacOSX.sh
     if [ ! -d out/build-cpp11-libcpp-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi
     echo '     ...done'
 
+rm -rf out/packages
+
 ./scripts/make_universal.sh
 
 cd ../../
@@ -71,6 +73,8 @@ source Linux.sh
     if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
     if [ ! -d out/build-cpp11-libstdcpp-gcc-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi
 
+rm -rf out/packages
+
 cd ../../
 ./configure \
 --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/lib/pkgconfig \