From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Jan 2013 05:09:23 +0000 (-0800)
Subject: Merge branch 'jc/makefile-perl-python-path-doc'
X-Git-Tag: v1.8.2-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f55cb042bd70d0582341ded76f18c74c770b2ff3?ds=inline;hp=-c

Merge branch 'jc/makefile-perl-python-path-doc'

* 'jc/makefile-perl-python-path-doc':
Makefile: add description on PERL/PYTHON_PATH
---

f55cb042bd70d0582341ded76f18c74c770b2ff3
diff --combined Makefile
index a786d4ce7a,1695075992..fd635acb2e
--- a/Makefile
+++ b/Makefile
@@@ -241,11 -241,16 +241,16 @@@ all:
  # apostrophes to be ASCII so that cut&pasting examples to the shell
  # will work.
  #
+ # Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl).
+ #
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
  # Define NO_PERL if you do not want Perl scripts or libraries at all.
  #
+ # Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
+ # but /usr/bin/python2.7 on some platforms).
+ #
  # Define NO_PYTHON if you do not want Python scripts or libraries at all.
  #
  # Define NO_TCLTK if you do not want Tcl/Tk GUI.
@@@ -649,7 -654,7 +654,7 @@@ LIB_H += list-objects.
  LIB_H += ll-merge.h
  LIB_H += log-tree.h
  LIB_H += mailmap.h
 -LIB_H += merge-file.h
 +LIB_H += merge-blobs.h
  LIB_H += merge-recursive.h
  LIB_H += mergesort.h
  LIB_H += notes-cache.h