summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-01-16 21:10:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-16 21:43:50 (GMT)
commit8bef62049b46038334ed6f065fdac27758070a5e (patch)
tree120dd6e8f225aa410649e604f4d476b980dd70c8
parenta9877f83e0da46efcbc552bd439acee2dcc499d0 (diff)
downloadgit-8bef62049b46038334ed6f065fdac27758070a5e.zip
git-8bef62049b46038334ed6f065fdac27758070a5e.tar.gz
git-8bef62049b46038334ed6f065fdac27758070a5e.tar.bz2
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>
-rw-r--r--perl/Makefile.PL4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 4168775..9b117fd 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -20,6 +20,10 @@ if ($@) {
my %extra;
$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(
NAME => 'Git',
VERSION_FROM => 'Git.pm',