combine-diff: a few more finishing touches.

[git.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 63af8eccf3ce115a992cc3f1dc812e5842e3f75f..fce6bc39d562271417fe4caeaf2d5dd9691deaf8 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -13,6 +13,15 @@ that uses $prefix, the built results have some paths encoded,
 which are derived from $prefix, so "make all; make prefix=/usr
 install" would not work.
 
 which are derived from $prefix, so "make all; make prefix=/usr
 install" would not work.
 

+Alternatively you can use autoconf generated ./configure script to
+set up install paths (via config.mak.autogen), so you can write instead
+
+       $ make configure ;# as yourself
+       $ ./configure --prefix=/usr ;# as yourself
+       $ make all doc ;# as yourself
+       # make install install-doc ;# as root
+
+

 Issues of note:
 
  - git normally installs a helper script wrapper called "git", which
 Issues of note:
 
  - git normally installs a helper script wrapper called "git", which


@@ -29,6 +38,19 @@ Issues of note:
    has been actively developed since 1997, and people have moved over to
    graphical file managers.
 
    has been actively developed since 1997, and people have moved over to
    graphical file managers.
 

+ - You can use git after building but without installing if you
+   wanted to.  Various git commands need to find other git
+   commands and scripts to do their work, so you would need to
+   arrange a few environment variables to tell them that their
+   friends will be found in your built source area instead of at
+   their standard installation area.  Something like this works
+   for me:
+
+       GIT_EXEC_PATH=`pwd`
+       PATH=`pwd`:$PATH
+       GITPERLLIB=`pwd`/perl/blib/lib
+       export GIT_EXEC_PATH PATH GITPERLLIB
+

  - Git is reasonably self-sufficient, but does depend on a few external
    programs and libraries:
 
  - Git is reasonably self-sufficient, but does depend on a few external
    programs and libraries:
 


@@ -44,7 +66,7 @@ Issues of note:
 
        - "libcurl" and "curl" executable.  git-http-fetch and
          git-fetch use them.  If you do not use http
 
        - "libcurl" and "curl" executable.  git-http-fetch and
          git-fetch use them.  If you do not use http

-         transfer, you are probabaly OK if you do not have
+         transfer, you are probably OK if you do not have

          them.
 
        - expat library; git-http-push uses it for remote lock
          them.
 
        - expat library; git-http-push uses it for remote lock


@@ -69,7 +91,7 @@ Issues of note:
          git, and if you only use git to track other peoples work you'll
          never notice the lack of it. 
 
          git, and if you only use git to track other peoples work you'll
          never notice the lack of it. 
 

-        - "wish", the TCL/Tk windowing shell is used in gitk to show the
+        - "wish", the Tcl/Tk windowing shell is used in gitk to show the

           history graphically
 
        - "ssh" is used to push and pull over the net
           history graphically
 
        - "ssh" is used to push and pull over the net


@@ -96,7 +118,7 @@ Issues of note:
 
        $ mkdir manual && cd manual
        $ git init-db
 
        $ mkdir manual && cd manual
        $ git init-db

-       $ git clone-pack git://git.kernel.org/pub/scm/git/git.git man html |
+       $ git fetch-pack git://git.kernel.org/pub/scm/git/git.git man html |

          while read a b
          do
            echo $a >.git/$b
          while read a b
          do
            echo $a >.git/$b