summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-07-22 21:15:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-25 07:08:56 (GMT)
commit058fb414804d545cc7dcca1313078d6a7e7bbd37 (patch)
tree0f805ad2db552751e8ad527c9e8a2ac3e170c376 /perl
parentc84bb14ce52b6559e0b8e10d554ff9b47149c042 (diff)
downloadgit-058fb414804d545cc7dcca1313078d6a7e7bbd37.zip
git-058fb414804d545cc7dcca1313078d6a7e7bbd37.tar.gz
git-058fb414804d545cc7dcca1313078d6a7e7bbd37.tar.bz2
perl/Makefile: update NO_PERL_MAKEMAKER section
The perl modules must be copied to blib/lib so they are available for testing. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl/Makefile b/perl/Makefile
index 5e079ad..b8547db 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -22,13 +22,18 @@ clean:
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst ','\'',$(prefix)/lib)
$(makfile): ../GIT-CFLAGS Makefile
- echo all: > $@
- echo ' :' >> $@
+ echo all: private-Error.pm Git.pm > $@
+ echo ' mkdir -p blib/lib' >> $@
+ echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
+ echo ' $(RM) blib/lib/Error.pm' >> $@
+ '$(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; \
- cp private-Error.pm $(instdir_SQ)/Error.pm' >> $@
+ echo ' $(RM) $(instdir_SQ)/Error.pm' >> $@
+ '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
+ echo ' cp private-Error.pm $(instdir_SQ)/Error.pm' >> $@
echo instlibdir: >> $@
echo ' echo $(instdir_SQ)' >> $@
else