Add mergetool support to the classic StGit infrastructure

[stgit] / INSTALL

diff --git a/INSTALL b/INSTALL
index c018351..3da4efd 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,18 @@
 For basic installation:
 
-       python setup.py install
+       $ make all doc ;# as yourself
+       $ make install install-doc ;# as yourself
 
-For more information:
+By default, the above command installs StGIT in the
+$HOME/{bin,lib,share} directories. For a different location, use the
+prefix option.
+
+       $ make prefix=/usr all doc #; as yourself
+       # make prefix=/usr install install-doc #; as root
+
+Issues of note:
+
+- To build and install the documentation, you need to have the
+  asciidoc/xmlto toolchain.  The default build target ("make all")
+  does _not_ build them.
 
-       http://docs.python.org/inst/inst.html