summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-08 22:07:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-08 22:07:45 (GMT)
commit2cdf87ebd9976d98d544669d94b111fea731d2ba (patch)
treeb1587e6585e279f2d6cf774b54ad53d6cc56059c /perl
parenta552db3a64464f1b514b074fbc43aaf599106087 (diff)
downloadgit-2cdf87ebd9976d98d544669d94b111fea731d2ba.zip
git-2cdf87ebd9976d98d544669d94b111fea731d2ba.tar.gz
git-2cdf87ebd9976d98d544669d94b111fea731d2ba.tar.bz2
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>
Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile2
-rw-r--r--perl/Makefile.PL1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl/Makefile b/perl/Makefile
index bd483b0..099beda 100644
--- 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 de73235..4168775 100644
--- 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
);