From 837f755c376f2b5cf77b74b55cb4cb64e7e7a3bb Mon Sep 17 00:00:00 2001
From: Matthew Brett <matthew.brett@gmail.com>
Date: Sat, 28 Jun 2014 18:31:38 +0100
Subject: [PATCH] BF: fixes from first travis run

---
 .travis.yml           | 8 ++++----
 library_installers.sh | 4 ++--
 run_install.sh        | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 98e9a4297..088205478 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ language:
 
 env:
   matrix:
-    - VERSION=2.7.7 NUMPY_VERSION=1.6.0
-    - VERSION=3.3.5 NUMPY_VERSION=1.7.1
-    - VERSION=3.4.1 NUMPY_VERSION=1.7.1
+    - VERSION=2.7.7
+    - VERSION=3.3.5
+    - VERSION=3.4.1
 
 install:
     - source run_install.sh
@@ -22,7 +22,7 @@ script:
     - python selftest.py --installed
     - cd ..
 
-before_deploy: cd scikit-image/dist
+before_deploy: cd Pillow/dist
 deploy:
   provider: cloudfiles
   username: travis-worker
diff --git a/library_installers.sh b/library_installers.sh
index 169b2269a..6d6172bf2 100755
--- a/library_installers.sh
+++ b/library_installers.sh
@@ -49,8 +49,8 @@ function init_vars {
     SRC_PREFIX=$PWD/working
     BUILD_PREFIX=$PWD/build
     export PATH=$BUILD_PREFIX/bin:$PATH
-    CPATH=$BUILD_PREFIX/include
-    LIBRARY_PATH=$BUILD_PREFIX/lib
+    export CPATH=$BUILD_PREFIX/include
+    export LIBRARY_PATH=$BUILD_PREFIX/lib
 }
 
 
diff --git a/run_install.sh b/run_install.sh
index 1b8335379..face9c401 100644
--- a/run_install.sh
+++ b/run_install.sh
@@ -10,6 +10,8 @@ install_tiff
 install_libpng
 install_lcms2
 install_webp
+# Need cmake for openjpeg
+brew install cmake
 install_openjpeg
 # Fix openjpeg library install id
 install_name_tool -id $PWD/build/lib/libopenjp2.6.dylib build/lib/libopenjp2.2.0.0.dylib