Fix perl/ build.

An earlier commit f848718a broke the build in perl/ directory by
allowing the Makefile.PL to overwrite the now-tracked Makefile.
Fix this by forcing Makefile.PL to produce its output in
perl.mak as the broken commit originally intended.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/perl/Makefile b/perl/Makefile
index bd483b099760719bcbd3ae67c2321b675ad26881..099beda873e91ebacf1068531fe194fa041ed9d6 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -29,7 +29,7 @@ $(makfile): ../GIT-CFLAGS Makefile
        echo '  echo $(instdir_SQ)' >> $@
 else
 $(makfile): Makefile.PL ../GIT-CFLAGS
-       '$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'
+       '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
 endif
 
 # this is just added comfort for calling make directly in perl dir

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index de73235e4c3142381c4ea01597e18b14cd65bc02..41687757a7fdd9c09bd320b92ed7f089af00a403 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -24,5 +24,6 @@ WriteMakefile(
        NAME            => 'Git',
        VERSION_FROM    => 'Git.pm',
        PM              => \%pm,
+       MAKEFILE        => 'perl.mak',
        %extra
 );