From 9c22fc890b4325a5d5e1a3bc46933c54bb0d4d02 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sat, 9 Feb 2013 00:57:04 -0500
Subject: [PATCH] merge both README

---
 interfaces/python/README     | 50 ++++++++++++++++++++++++++++++++++++
 interfaces/python/README.osx | 44 -------------------------------
 2 files changed, 50 insertions(+), 44 deletions(-)
 delete mode 100644 interfaces/python/README.osx

diff --git a/interfaces/python/README b/interfaces/python/README
index adfb22c5..ba516e3a 100644
--- a/interfaces/python/README
+++ b/interfaces/python/README
@@ -1,5 +1,55 @@
+===================
+Python aubio module
+===================
+
 This module wraps the aubio library for python using the numpy module.
 
 http://docs.python.org/c-api/index.html
 
 http://docs.scipy.org/doc/numpy/reference/c-api.html
+
+Instructions to compile the python module on Mac OS X
+-----------------------------------------------------
+
+Note: the following URLs to download from are given as examples only, you
+should check the corresponding pages for newer versions
+
+# install python 2.7 from python.org
+
+  url: http://www.python.org/
+
+  $ curl -O http://www.python.org/ftp/python/2.7.3/python-2.7.3-macosx10.6.dmg
+
+  $ open python-2.7.3-macosx10.6.dmg
+
+  follow the instructions
+
+# install setuptools http://pypi.python.org/pypi/setuptools
+
+  url: http://pypi.python.org/pypi/setuptools#files
+
+  $ curl -O http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11-py2.7.egg
+
+  $ [sudo] sh setuptools-0.6c9-py2.4.egg
+
+# install pip 
+
+  url: http://www.pip-installer.org/en/latest/installing.html
+
+  $ curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+
+  $ [sudo] python get-pip.py
+
+# install Scipy superpack
+
+  url: http://www.scipy.org/Download and http://fonnesbeck.github.com/ScipySuperpack/
+
+  $ curl -O https://raw.github.com/fonnesbeck/ScipySuperpack/master/install_superpack.sh
+
+  $ sh install_superpack.sh
+
+# you should now be able to build the new python module
+
+  make sure the variables are correct in the file build_osx before running it:
+
+  $ ./build_osx
diff --git a/interfaces/python/README.osx b/interfaces/python/README.osx
deleted file mode 100644
index 18427bd4..00000000
--- a/interfaces/python/README.osx
+++ /dev/null
@@ -1,44 +0,0 @@
-Instructions to compile the python module on Mac OS X
-
-Note: the following URLs to download from are given as examples only, you
-should check the corresponding pages for newer versions
-
-# install python 2.7 from python.org
-
-  url: http://www.python.org/
-
-  $ curl -O http://www.python.org/ftp/python/2.7.3/python-2.7.3-macosx10.6.dmg
-
-  $ open python-2.7.3-macosx10.6.dmg
-
-  follow the instructions
-
-# install setuptools http://pypi.python.org/pypi/setuptools
-
-  url: http://pypi.python.org/pypi/setuptools#files
-
-  $ curl -O http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11-py2.7.egg
-
-  $ [sudo] sh setuptools-0.6c9-py2.4.egg
-
-# install pip 
-
-  url: http://www.pip-installer.org/en/latest/installing.html
-
-  $ curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
-
-  $ [sudo] python get-pip.py
-
-# install Scipy superpack
-
-  url: http://www.scipy.org/Download and http://fonnesbeck.github.com/ScipySuperpack/
-
-  $ curl -O https://raw.github.com/fonnesbeck/ScipySuperpack/master/install_superpack.sh
-
-  $ sh install_superpack.sh
-
-# you should now be able to build the new python module
-
-  make sure the variables are correct in the file build_osx before running it:
-
-  $ ./build_osx
-- 
2.26.2