summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:38 -0700
commit8d64216807940f39512a248b5911326b9423a8b6 (patch)
treef762a4cdf817a5b59c522ca2a091da0cff4f56f7
parent172b811322e30ecb3cd660319890e41bc40006bc (diff)
parent259f22af90041f6e527971c2547d38832de93a85 (diff)
downloadgit-8d64216807940f39512a248b5911326b9423a8b6.tar.gz
Merge branch 'ew/find-perl-on-freebsd-in-local' into maint
Recent FreeBSD stopped making perl available at /usr/bin/perl; switch the default the built-in path to /usr/local/bin/perl on not too ancient FreeBSD releases. * ew/find-perl-on-freebsd-in-local: config.mak.uname: correct perl path on FreeBSD
-rw-r--r--config.mak.uname1
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index a88f13989a..4cd62bda4f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -203,6 +203,7 @@ ifeq ($(uname_S),FreeBSD)
NO_STRTOUMAX = YesPlease
endif
PYTHON_PATH = /usr/local/bin/python
+ PERL_PATH = /usr/local/bin/perl
HAVE_PATHS_H = YesPlease
GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
HAVE_BSD_SYSCTL = YesPlease