From: Brandon Casey Date: Tue, 22 Jul 2008 21:15:41 +0000 (-0500) Subject: perl/Makefile: update NO_PERL_MAKEMAKER section X-Git-Tag: v1.6.0-rc1~42 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=058fb414804d545cc7dcca1313078d6a7e7bbd37;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/perl/Makefile b/perl/Makefile index 5e079ad01..b8547db2c 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