diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-21 19:44:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-22 19:20:40 (GMT) |
| commit | 3696c4ce89d97c34566a4a89720cfdae2a86fa38 (patch) | |
| tree | 484a9f07036a2a05a3f264304af88fde1d975f72 | |
| parent | f1e3156e627fa66714deea665c8f3585088b9695 (diff) | |
| download | git-3696c4ce89d97c34566a4a89720cfdae2a86fa38.zip git-3696c4ce89d97c34566a4a89720cfdae2a86fa38.tar.gz git-3696c4ce89d97c34566a4a89720cfdae2a86fa38.tar.bz2 | |
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>
| -rw-r--r-- | perl/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl/Makefile b/perl/Makefile index e3dd1a5..4ab21d6 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -29,11 +29,11 @@ $(makfile): ../GIT-CFLAGS Makefile '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ echo ' cp private-Error.pm blib/lib/Error.pm' >> $@ echo install: >> $@ - echo ' mkdir -p "$(instdir_SQ)"' >> $@ - echo ' $(RM) "$(instdir_SQ)/Git.pm"; cp Git.pm "$(instdir_SQ)"' >> $@ - echo ' $(RM) "$(instdir_SQ)/Error.pm"' >> $@ + echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@ + echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@ + echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ - echo ' cp private-Error.pm "$(instdir_SQ)/Error.pm"' >> $@ + echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ echo instlibdir: >> $@ echo ' echo $(instdir_SQ)' >> $@ else |