[PATCH] Don't cache DESTDIR in perl/perl.mak.
- From
Gerrit Pape <pape@smarden.org>
- Date
- Dec 10, 2007, 09:31 UTC
- Message-ID
- <20071210093102.3050.qmail@06e91d20307a62.315fe32.mid.smarden.org>
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> --- Makefile | 2 +- perl/Makefile.PL | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile index 4cdb84b..3615be0 100644 --- a/Makefile +++ b/Makefile @@ -1025,7 +1025,7 @@ install: all $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install - $(MAKE) -C perl prefix='$(prefix_SQ)' install + $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install ifndef NO_TCLTK $(MAKE) -C gitk-git install $(MAKE) -C git-gui install diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 6aecd89..320253e 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' );
-- 1.5.3.4