Use python command instead of python2 for now

leowini · Mar 18, 2015 · fd54412 · fd54412
1 parent 54565e8
commit fd54412
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ Be sure to update your `PYTHONPATH` to include `/usr/local/lib/python2.7/site-pa
 
 ## Building
 
-    python2 setup.py build
+    python setup.py build
 
 
 ## Running

diff --git a/bin/detect_features b/bin/detect_features
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 import os.path, sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 

diff --git a/bin/focal_from_exif b/bin/focal_from_exif
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 import os.path, sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 

diff --git a/opensfm/src/third_party/libmv/tools/tool.h b/opensfm/src/third_party/libmv/tools/tool.h
@@ -32,6 +32,10 @@
 
 namespace libmv {
 
+#ifndef gflags
+namespace gflags=google;
+#endif
+
 inline void Init(const char *usage, int *argc, char ***argv) {
   google::InitGoogleLogging((*argv)[0]);
   gflags::SetUsageMessage(std::string(usage));