Merge branch 'travis' of github.com:arrayfire/arrayfire-haskell into travis

Author: dmjio

arrayfire.cabal

@@ -90,20 +90,14 @@ library
   default-language:
     Haskell2010
 
-  if os(linux) && !flag(disable-default-paths)
+  if (os(linux) || os(OSX)) && !flag(disable-default-paths)
     include-dirs:
       /opt/arrayfire/include
     extra-lib-dirs:
+      /opt/arrayfire/lib64
       /opt/arrayfire/lib
     ld-options:
       -Wl,-rpath /opt/arrayfire/lib
-
-  if os(OSX) && !flag(disable-default-paths)
-    include-dirs:
-      /opt/arrayfire/include
-    extra-lib-dirs:
-      /opt/arrayfire/lib64
-    ld-options:
       -Wl,-rpath /opt/arrayfire/lib64
 
 executable main