branch merge

andrewcron · Oct 29, 2012 · 816fa87 · 816fa87
1 parent 21e3d6d
commit 816fa87
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/example/setup.py b/example/setup.py
@@ -21,8 +21,9 @@
                 [#arma_inc_dir+"/cyarma.cpp",
                                    "example/example.pyx"],
                 include_dirs = [get_include(), '/usr/include',
+				'/usr/local/include',
                                 arma_inc_dir,'./example', '.'],
-                library_dirs = ['/usr/lib'],
+                library_dirs = ['/usr/lib', '/usr/local/lib'],
                 libraries=["armadillo"],
                 language='c++')],
       )