diff options
author | Ira Rice <irarice@gmail.com> | 2008-12-28 19:36:22 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2008-12-28 19:36:22 -0700 |
commit | 6b680b60af9084767fd50737df763a89ca2c2919 (patch) | |
tree | 307479acb0aefe6e9136c81416acf8b66ba50bdb /INSTALL | |
parent | 28f93e08a567dfceae93a0b70997eaa3e9593a4b (diff) | |
download | mana-client-6b680b60af9084767fd50737df763a89ca2c2919.tar.gz mana-client-6b680b60af9084767fd50737df763a89ca2c2919.tar.bz2 mana-client-6b680b60af9084767fd50737df763a89ca2c2919.tar.xz mana-client-6b680b60af9084767fd50737df763a89ca2c2919.zip |
Fixed some dangling diffs that never got fixed.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'INSTALL')
-rw-r--r-- | INSTALL | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -5,11 +5,7 @@ Homepage: http://www.aethyra.org/ IRC: irc.freenode.net / #aethyra 1) Requirements -<<<<<<< HEAD:INSTALL 2) Compiling Aethyra -======= -2) Compiling And Installing The Mana World ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL 3) Notes @@ -30,12 +26,8 @@ a source release. To get Aethyra to compile, you need a compiler * zlib 1.2.x http://www.gzip.org/zlib/ * libcurl http://curl.haxx.se/libcurl/ -<<<<<<< HEAD:INSTALL -If you checked Aethyra out from Subversion you will also need these tools to +If you cloned Aethyra from the Git repository, you will also need these tools to compile: -======= -If you've cloned the Git repository, you will also need these tools to compile: ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL * GNU automake 1.9 http://www.gnu.org/software/automake/ * GNU autoconf http://www.gnu.org/software/autoconf/ @@ -48,15 +40,11 @@ you to figure this out. =============================================== 1) Go to the directory you have extracted the source to. -<<<<<<< HEAD:INSTALL -2) If you checked out from SVN, run "./autobuild.sh" to install the client. -======= 2) If you've cloned the Git repository, run "autoreconf -i" to generate configure and install any missing auxiliary files. 3) Run "./configure" 4) Run "make" 5) Run "make install" as root ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL It should have installed Aethyra on your system now, and you can run it with "aethyra". By default all files are installed to /usr/local, you can |