diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-08 14:07:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-08 14:07:45 -0800 |
| commit | 2cdf87ebd9976d98d544669d94b111fea731d2ba (patch) | |
| tree | b1587e6585e279f2d6cf774b54ad53d6cc56059c /perl | |
| parent | a552db3a64464f1b514b074fbc43aaf599106087 (diff) | |
| download | git-2cdf87ebd9976d98d544669d94b111fea731d2ba.tar.gz | |
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/Makefile | 2 | ||||
| -rw-r--r-- | perl/Makefile.PL | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl/Makefile b/perl/Makefile index bd483b0997..099beda873 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 de73235e4c..41687757a7 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 ); |