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>
Gerrit Pape committed
Dec 10, 2007 at 09:31 UTC
28072a5d303b212695ef8b70f24cfed069ec94b8
2 files changed
+2
-6
Makefile
+1
-1
@@ -1025,7 +1025,7 @@ install: all
1025
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
1026
$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
1027
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
1028
- $(MAKE) -C perl prefix='$(prefix_SQ)' install
1028
+ $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
1029
ifndef NO_TCLTK
1030
$(MAKE) -C gitk-git install
1031
$(MAKE) -C git-gui install
perl/Makefile.PL
+1
-5
@@ -17,9 +17,6 @@ if ($@ || $Error::VERSION < 0.15009) {
17
$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
18
}
19
20
-my %extra;
21
-$extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
22
-
20
# redirect stdout, otherwise the message "Writing perl.mak for Git"
21
# disrupts the output for the target 'instlibdir'
22
open STDOUT, ">&STDERR";
@@ -29,6 +26,5 @@ WriteMakefile(
26
VERSION_FROM => 'Git.pm',
27
PM => \%pm,
28
MAKEFILE => 'perl.mak',
32
- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
33
- %extra
29
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
30
);