Merge remote-tracking branch 'ProjectTox/master'

This commit is contained in:
Astonex 2013-07-29 23:05:24 +01:00
commit ca5660cc47
3 changed files with 5 additions and 5 deletions

View File

@ -28,6 +28,6 @@ notifications:
irc:
channels:
- "chat.freenode.net#InsertProjectNameHere"
- "chat.freenode.net#tox-dev"
on_success: always
on_failure: always

View File

@ -42,8 +42,8 @@ make
###OSX:
Much the same as above, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool
Libtool is easy enough to install, grab it from http://www.gnu.org/software/libtool/ and:
Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool, automake and autoconf.
They are easy enough to install, grab them from http://www.gnu.org/software/libtool/, http://www.gnu.org/software/autoconf/ and http://www.gnu.org/software/automake/, then follow these steps for each:
```bash
./configure
@ -51,7 +51,7 @@ make
sudo make install
```
Do not install it from macports (or any dependencies for that matter) as they get shoved in the wrong directory
Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
and make your life more annoying.
Another thing you may want to install is the latest gcc, this caused me a few problems as XCode from 4.3

View File

@ -6,7 +6,7 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
**IRC**: #InsertProjectNameHere (literally!) on Freenode, alternatively, you can use the [webchat](https://webchat.freenode.net/).<br />
**IRC**: #tox on Freenode, alternatively, you can use the [webchat](http://webchat.freenode.net/?channels=#tox).<br />
**Website**: [http://tox.im](http://tox.im)
**Website translations**: [see stal888's repository](https://github.com/stal888/ProjectTox-Website)<br/>