undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't cache DESTDIR in perl/perl.mak.

Browse Source 
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>
This commit is contained in:
Gerrit Pape 2007-12-10 09:31:02 +00:00 committed by Junio C Hamano
parent 923db42eea
commit 28072a5d30
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1025,7 +1025,7 @@ install: all
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install $(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 ifndef NO_TCLTK
$(MAKE) -C gitk-git install $(MAKE) -C gitk-git install
$(MAKE) -C git-gui install $(MAKE) -C git-gui install

6
perl/Makefile.PL
View File

@ -17,9 +17,6 @@ if ($@ || $Error::VERSION < 0.15009) {
$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm'; $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" # redirect stdout, otherwise the message "Writing perl.mak for Git"
# disrupts the output for the target 'instlibdir' # disrupts the output for the target 'instlibdir'
open STDOUT, ">&STDERR"; open STDOUT, ">&STDERR";
@ -29,6 +26,5 @@ WriteMakefile(
VERSION_FROM => 'Git.pm', VERSION_FROM => 'Git.pm',
PM => \%pm, PM => \%pm,
MAKEFILE => 'perl.mak', MAKEFILE => 'perl.mak',
INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3', INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
%extra
); );