Merge branch 'pb/configure'

* pb/configure:
Rename man1 and man7 variables to man1dir and man7dir
Allow INSTALL, bindir, mandir to be set in main Makefile

diff --combined Documentation/Makefile
index 6dbe45b50626bf09c5a37c80473f0a4fe18136f9,cc83610588c24e2da863449facd656fb8c07907f..0d9ffb4ad9475de730ab2ee240d8b528b44017e8
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -25,10 -25,10 +25,10 @@@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TX
  DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
  
  prefix?=$(HOME)
- bin=$(prefix)/bin
- mandir=$(prefix)/man
- man1=$(mandir)/man1
- man7=$(mandir)/man7
+ bindir?=$(prefix)/bin
+ mandir?=$(prefix)/man
+ man1dir=$(mandir)/man1
+ man7dir=$(mandir)/man7
  # DESTDIR=
  
  INSTALL?=install
@@@ -46,16 -46,15 +46,16 @@@ all: html ma
  
  html: $(DOC_HTML)
  
 +$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN7): asciidoc.conf
  
  man: man1 man7
  man1: $(DOC_MAN1)
  man7: $(DOC_MAN7)
  
  install: man
-       $(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)
-       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)
-       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)
+       $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
+       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)
+       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)
  
  
  #

diff --combined Makefile
index 691e40b7b2786b726250e06fed4e29135c461cee,ccd7c62e5760ec140b5860b30fd557ec3900fa3e..49eaa10b3be884a2aebdcea51ca50d0018e869f5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -33,22 -33,6 +33,22 @@@ all
  # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
  # Enable it on Windows.  By default, symrefs are still used.
  #
 +# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
 +# tests.  These tests take up a significant amount of the total test time
 +# but are not needed unless you plan to talk to SVN repos.
 +#
 +# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
 +# installed in /sw, but don't want GIT to link against any libraries
 +# installed there.  If defined you may specify your own (or Fink's)
 +# include directories and library directories by defining CFLAGS
 +# and LDFLAGS appropriately.
 +#
 +# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
 +# have DarwinPorts installed in /opt/local, but don't want GIT to
 +# link against any libraries installed there.  If defined you may
 +# specify your own (or DarwinPort's) include directories and
 +# library directories by defining CFLAGS and LDFLAGS appropriately.
 +#
  # Define PPC_SHA1 environment variable when running make to make use of
  # a bundled SHA1 routine optimized for PowerPC.
  #
@@@ -76,7 -60,7 +76,7 @@@
  # Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
  # a missing newline at the end of the file.
  #
 -# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
 +# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
  #
  # Define COLLISION_CHECK below if you believe that SHA1's
  # 1461501637330902918203684832716283019655932542976 hashes do not give you
@@@ -116,6 -100,8 +116,8 @@@ template_dir = $(prefix)/share/git-core
  GIT_PYTHON_DIR = $(prefix)/share/git-core/python
  # DESTDIR=
  
+ export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
+ 
  CC = gcc
  AR = ar
  TAR = tar
@@@ -136,7 -122,7 +138,7 @@@ SCRIPT_SH = 
        git-fetch.sh \
        git-ls-remote.sh \
        git-merge-one-file.sh git-parse-remote.sh \
 -      git-prune.sh git-pull.sh git-rebase.sh \
 +      git-pull.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
        git-resolve.sh git-revert.sh git-sh-setup.sh \
        git-tag.sh git-verify-tag.sh \
@@@ -147,10 -133,10 +149,10 @@@
  
  SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
 -      git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
 +      git-shortlog.perl git-rerere.perl \
        git-annotate.perl git-cvsserver.perl \
        git-svnimport.perl git-mv.perl git-cvsexportcommit.perl \
 -      git-send-email.perl
 +      git-send-email.perl git-svn.perl
  
  SCRIPT_PYTHON = \
        git-merge-recursive.py
@@@ -158,7 -144,7 +160,7 @@@
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
          $(patsubst %.perl,%,$(SCRIPT_PERL)) \
          $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
 -        git-cherry-pick git-status
 +        git-cherry-pick git-status git-instaweb
  
  # The ones that do not have to link with lcrypto, lz nor xdiff.
  SIMPLE_PROGRAMS = \
@@@ -189,8 -175,7 +191,8 @@@ BUILT_INS = git-log$X git-whatchanged$
        git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
        git-read-tree$X git-commit-tree$X git-write-tree$X \
        git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
 -      git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X
 +      git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
 +      git-fmt-merge-msg$X git-prune$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -234,7 -219,7 +236,7 @@@ LIB_OBJS = 
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
 -      alloc.o $(DIFF_OBJS)
 +      alloc.o merge-file.o $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
@@@ -246,7 -231,7 +248,7 @@@
        builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
        builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
        builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
 -      builtin-update-ref.o
 +      builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -266,17 -251,15 +268,17 @@@ ifeq ($(uname_S),Darwin
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
        NO_STRLCPY = YesPlease
 -      ## fink
 -      ifeq ($(shell test -d /sw/lib && echo y),y)
 -              ALL_CFLAGS += -I/sw/include
 -              ALL_LDFLAGS += -L/sw/lib
 +      ifndef NO_FINK
 +              ifeq ($(shell test -d /sw/lib && echo y),y)
 +                      ALL_CFLAGS += -I/sw/include
 +                      ALL_LDFLAGS += -L/sw/lib
 +              endif
        endif
 -      ## darwinports
 -      ifeq ($(shell test -d /opt/local/lib && echo y),y)
 -              ALL_CFLAGS += -I/opt/local/include
 -              ALL_LDFLAGS += -L/opt/local/lib
 +      ifndef NO_DARWIN_PORTS
 +              ifeq ($(shell test -d /opt/local/lib && echo y),y)
 +                      ALL_CFLAGS += -I/opt/local/include
 +                      ALL_LDFLAGS += -L/opt/local/lib
 +              endif
        endif
  endif
  ifeq ($(uname_S),SunOS)
@@@ -487,7 -470,7 +489,7 @@@ ifdef NO_ACCURATE_DIF
        ALL_CFLAGS += -DNO_ACCURATE_DIFF
  endif
  
 -# Shell quote (do not use $(call) to accomodate ancient setups);
 +# Shell quote (do not use $(call) to accommodate ancient setups);
  
  SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
  
@@@ -532,7 -515,6 +534,7 @@@ common-cmds.h: Documentation/git-*.tx
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
        rm -f $@ $@+
        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +          -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
            -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
@@@ -565,20 -547,6 +567,20 @@@ git-status: git-commi
        cp $< $@+
        mv $@+ $@
  
 +git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
 +      rm -f $@ $@+
 +      sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +          -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 +          -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 +          -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
 +          -e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
 +          -e '/@@GITWEB_CGI@@/d' \
 +          -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
 +          -e '/@@GITWEB_CSS@@/d' \
 +          $@.sh | sed "s|/usr/bin/git|$(bindir)/git|" > $@+
 +      chmod +x $@+
 +      mv $@+ $@
 +
  # These can record GIT_VERSION
  git$X git.spec \
        $(patsubst %.sh,%,$(SCRIPT_SH)) \
@@@ -621,11 -589,11 +623,11 @@@ git-ssh-push$X: rsh.
  git-imap-send$X: imap-send.o $(LIB_FILE)
  
  http.o http-fetch.o http-push.o: http.h
 -git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
 +git-http-fetch$X: fetch.o http.o http-fetch.o $(GITLIBS)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 -git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
 +git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
@@@ -671,7 -639,6 +673,7 @@@ GIT-CFLAGS: .FORCE-GIT-CFLAG
  # with that.
  
  export NO_PYTHON
 +export NO_SVN_TESTS
  
  test: all
        $(MAKE) -C t/ all
@@@ -685,12 -652,6 +687,12 @@@ test-delta$X: test-delta.c diff-delta.
  test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 +test-sha1$X: test-sha1.o $(GITLIBS)
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
 +check-sha1:: test-sha1$X
 +      ./test-sha1.sh
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -753,8 -714,8 +755,8 @@@ dist-doc
        rm -fr .doc-tmp-dir
        mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
        $(MAKE) -C Documentation DESTDIR=./ \
-               man1=../.doc-tmp-dir/man1 \
-               man7=../.doc-tmp-dir/man7 \
+               man1dir=../.doc-tmp-dir/man1 \
+               man7dir=../.doc-tmp-dir/man7 \
                install
        cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
        gzip -n -9 -f $(manpages).tar