@matheusbsbs / matheus-bagliano / commits / 3696c4ce89
Fork 0

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 <gitster@pobox.com>

Junio C Hamano committed Sep 21, 2009 at 12:44 UTC 3696c4ce89d97c34566a4a89720cfdae2a86fa38
1 file changed +4 -4
perl/Makefile
+4 -4
@@ -29,11 +29,11 @@ $(makfile): ../GIT-CFLAGS Makefile
29 '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
30 echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
31 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"' >> $@
35 '$(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"' >> $@
37 echo instlibdir: >> $@
38 echo ' echo $(instdir_SQ)' >> $@
39 else