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

gitster · gitster · commit f55cb042bd70 · 2013-01-23T21:09:23.000-08:00
* 'jc/makefile-perl-python-path-doc':
  Makefile: add description on PERL/PYTHON_PATH
diff --git a/Makefile b/Makefile
@@ -241,11 +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.

Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,16 @@ all::`
`241`	`241`	`# apostrophes to be ASCII so that cut&pasting examples to the shell`
`242`	`242`	`# will work.`
`243`	`243`	`#`
	`244`	`+# Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl).`
	`245`	`+#`
`244`	`246`	`# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's`
`245`	`247`	`# MakeMaker (e.g. using ActiveState under Cygwin).`
`246`	`248`	`#`
`247`	`249`	`# Define NO_PERL if you do not want Perl scripts or libraries at all.`
`248`	`250`	`#`
	`251`	`+# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python`
	`252`	`+# but /usr/bin/python2.7 on some platforms).`
	`253`	`+#`
`249`	`254`	`# Define NO_PYTHON if you do not want Python scripts or libraries at all.`
`250`	`255`	`#`
`251`	`256`	`# Define NO_TCLTK if you do not want Tcl/Tk GUI.`