mirror of
https://github.com/git/git
synced 2024-10-12 03:22:35 +00:00
Fix spurious compile error
From time to time, I would get this error: [...] sed: -e expression #8, char 41: Unterminated `s' command make: *** [git-add--interactive] Error 1 Turns out that the function WriteMakefile() called in Makefile.PL outputs the message "Writing perl.mak for Git" to stdout! Thus, the output of "make -C perl -s --no-print-directory instlibdir" would be prefixed by that message whenever Makefile.PL was newer than perl.mak. This is fixed by redirecting stdout to stderr in Makefile.PL. Signed-off-by: Johannes E. Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a9877f83e0
commit
8bef62049b
|
@ -20,6 +20,10 @@ if ($@) {
|
||||||
my %extra;
|
my %extra;
|
||||||
$extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
|
$extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
|
||||||
|
|
||||||
|
# redirect stdout, otherwise the message "Writing perl.mak for Git"
|
||||||
|
# disrupts the output for the target 'instlibdir'
|
||||||
|
open STDOUT, ">&STDERR";
|
||||||
|
|
||||||
WriteMakefile(
|
WriteMakefile(
|
||||||
NAME => 'Git',
|
NAME => 'Git',
|
||||||
VERSION_FROM => 'Git.pm',
|
VERSION_FROM => 'Git.pm',
|
||||||
|
|
Loading…
Reference in a new issue