Merge branch 'ew/find-perl-on-freebsd-in-local'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:44 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:44 +0000 (10:34 -0700)
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

1  2 
config.mak.uname
diff --combined config.mak.uname
index 22958a8d6ffbf3ca937b5aac97bb9f616de70130,4cd62bda4f6187b71a5319524ee74272470ffe08..17fed2f43ac6f7564785e2074e7f130bd625c231
@@@ -36,8 -36,6 +36,8 @@@ ifeq ($(uname_S),Linux
        HAVE_DEV_TTY = YesPlease
        HAVE_CLOCK_GETTIME = YesPlease
        HAVE_CLOCK_MONOTONIC = YesPlease
 +      # -lrt is needed for clock_gettime on glibc <= 2.16
 +      NEEDS_LIBRT = YesPlease
        HAVE_GETDELIM = YesPlease
        SANE_TEXT_GREP=-a
  endif
@@@ -205,6 -203,7 +205,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