Merge commit 'viking-0.9.93' into help

[andy/viking.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 6a8bfe42ffaad71014d90614b7cf698c1b3e7b1f..5e7766a76804c212e161e1f4fded908a4b43e5e8 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -2,26 +2,15 @@ UNIX:
 
 You must have GTK+ 2.2.0 or greater installed.
 
-if from CVS:
-aclocal \
-&& autoheader \
-&& automake -a && automake \
-&& autoconf
+if from SVN (not from prepackaged tarball):
+./autogen.sh
 
 
 ./configure
 make
-strip --strip-all viking # optional)
-cp viking /usr/local/bin # as root)
-cp ../viking-remote /usr/local/bin # optional)
+make install # as root
 
-Or, if you are using GTK 2.2 (as opposed to 2.4 or greater):
-
-cd src
-make -f Makefile_GTK_2_2
-strip --strip-all viking
-cp viking /usr/local/bin
-cp ../viking-remote /usr/local/bin
+Run "./configure --help" for some configuration options.
 
 Try the "example.vik" file to get started.