diff options
author | Gerrit Pape <pape@smarden.org> | 2007-12-10 09:31:02 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-11 00:38:46 -0800 |
commit | 28072a5d303b212695ef8b70f24cfed069ec94b8 (patch) | |
tree | 8c809e2021fcb8d20a4c5f02f90fd73082ad7cc8 /perl | |
parent | 923db42eea6fac743d8c93f0af4904740a445edf (diff) | |
download | git-28072a5d303b212695ef8b70f24cfed069ec94b8.tar.gz git-28072a5d303b212695ef8b70f24cfed069ec94b8.tar.xz |
Don't cache DESTDIR in perl/perl.mak.
DESTDIR is supposed to be overridden on 'make install' after doing
'make'. Have the automatically generated perl/perl.mak not cache the
value of DESTDIR to support that for the perl/ subdirectory also.
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
-rw-r--r-- | perl/Makefile.PL | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 6aecd897f..320253eb8 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -17,9 +17,6 @@ if ($@ || $Error::VERSION < 0.15009) { $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm'; } -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"; @@ -29,6 +26,5 @@ WriteMakefile( VERSION_FROM => 'Git.pm', PM => \%pm, MAKEFILE => 'perl.mak', - INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3', - %extra + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3' ); |