Skip to content

Commit 3696c4c

Browse files
committed
pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
Building with prefix=/some/where and temporarily installing it to elsewhere for tar'ing up is done with: make prefix=/some/where make prefix=/some/where DESTDIR=/else/where install Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR. Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent versions of Perl ships with at leat 6.17; this patch does not address that issue. Signed-off-by: Junio C Hamano <[email protected]>
1 parent f1e3156 commit 3696c4c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

perl/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $(makfile): ../GIT-CFLAGS Makefile
2929
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
3030
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
3131
echo install: >> $@
32-
echo ' mkdir -p "$(instdir_SQ)"' >> $@
33-
echo ' $(RM) "$(instdir_SQ)/Git.pm"; cp Git.pm "$(instdir_SQ)"' >> $@
34-
echo ' $(RM) "$(instdir_SQ)/Error.pm"' >> $@
32+
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
33+
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
34+
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
3535
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
36-
echo ' cp private-Error.pm "$(instdir_SQ)/Error.pm"' >> $@
36+
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
3737
echo instlibdir: >> $@
3838
echo ' echo $(instdir_SQ)' >> $@
3939
else

0 commit comments

Comments
 (0)