Merge pull request #3017 from jxs/master

Fix #2954, add virtualenv installation instructions to osx and linux
This commit is contained in:
Simon Sapin 2014-08-05 14:31:21 +01:00
commit 4a5ac205f3

View file

@ -12,13 +12,14 @@ On OS X (homebrew):
``` sh ``` sh
brew install https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb brew install https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb
brew install automake libtool pkg-config brew install automake libtool pkg-config python
pip install virtualenv
``` ```
On OS X (MacPorts): On OS X (MacPorts):
``` sh ``` sh
sudo port install autoconf213 sudo port install autoconf213 python27 py27-virtualenv
``` ```
On Debian-based Linuxes: On Debian-based Linuxes:
@ -26,7 +27,7 @@ On Debian-based Linuxes:
``` sh ``` sh
sudo apt-get install autoconf2.13 curl freeglut3-dev libtool \ sudo apt-get install autoconf2.13 curl freeglut3-dev libtool \
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
msttcorefonts gperf g++ automake cmake msttcorefonts gperf g++ automake cmake python-virtualenv
``` ```
On Fedora: On Fedora:
@ -34,7 +35,7 @@ On Fedora:
``` sh ``` sh
sudo yum install autoconf213 curl freeglut-devel libtool \ sudo yum install autoconf213 curl freeglut-devel libtool \
freetype-devel mesa-libGL-devel glib2-devel libX11-devel \ freetype-devel mesa-libGL-devel glib2-devel libX11-devel \
gperf gcc-c++ rpm-build cabextract ttmkfdir gperf gcc-c++ rpm-build cabextract ttmkfdir python python-virtualenv
pushd . pushd .
cd /tmp cd /tmp
wget http://corefonts.sourceforge.net/msttcorefonts-2.5-1.spec wget http://corefonts.sourceforge.net/msttcorefonts-2.5-1.spec