]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/simplify-perl-makefile'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:03 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:03 +0000 (13:39 -0800)
The build procedure for perl/ part has been greatly simplified by
weaning ourselves off of MakeMaker.

* ab/simplify-perl-makefile:
  perl: treat PERLLIB_EXTRA as an extra path again
  perl: avoid *.pmc and fix Error.pm further
  Makefile: replace perl/Makefile.PL with simple make rules

1  2 
Makefile
git-send-email.perl
perl/Git.pm
t/perf/aggregate.perl
t/test-lib.sh

diff --cc Makefile
Simple merge
Simple merge
diff --cc perl/Git.pm
Simple merge
index 5c439f6bc23e782e09924c02abe3d4edc4cd0d03,923044df6a0ace8870c83eee5ce1de6fba682b28..3a0917fa61ef6e630ca4dc2bb28c2af671f98804
@@@ -1,9 -1,8 +1,9 @@@
  #!/usr/bin/perl
  
- use lib '../../perl/blib/lib';
+ use lib '../../perl/build/lib';
  use strict;
  use warnings;
 +use JSON;
  use Git;
  
  sub get_times {
diff --cc t/test-lib.sh
Simple merge