From: Junio C Hamano <gitster@pobox.com>
To: Brandon Casey <casey@nrlssc.navy.mil>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] perl/Makefile: update NO_PERL_MAKEMAKER section
Date: Wed, 23 Jul 2008 16:29:48 -0700 [thread overview]
Message-ID: <7vy73s89hv.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <XKT02T_QW2tKLHpR7e3VuZjLXv3RP2E0GD54gXKrdIFm8xQsKvAyjg@cipher.nrlssc.navy.mil> (Brandon Casey's message of "Tue, 22 Jul 2008 16:15:41 -0500")
Brandon Casey <casey@nrlssc.navy.mil> writes:
> The perl modules must be copied to blib/lib so they are available for
> testing.
True, but private-Error needs to be handled a bit more carefully, I
think.
How about this on top of your patch?
perl/Makefile | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/perl/Makefile b/perl/Makefile
index 2b0d3d5..b8547db 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -25,13 +25,15 @@ $(makfile): ../GIT-CFLAGS Makefile
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; \
- cp private-Error.pm blib/lib/Error.pm' >> $@
+ 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
next prev parent reply other threads:[~2008-07-23 23:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0GfECozN3g0ZvAESKMi76RyOVHEb2OhhwET9GWmEm7pbzYQJub50UlWpZtBa7MGn1UGb-7mzbzE@cipher.nrlssc.navy.mil>
2008-07-22 21:15 ` [PATCH] perl/Makefile: update NO_PERL_MAKEMAKER section Brandon Casey
2008-07-22 23:09 ` Petr Baudis
2008-07-23 16:22 ` Brandon Casey
2008-07-23 23:29 ` Junio C Hamano [this message]
2008-07-23 23:56 ` Brandon Casey
2008-07-22 21:16 ` [PATCH] t9700/test.pl: backwards compatibility improvements Brandon Casey
2008-07-23 23:33 ` Junio C Hamano
2008-07-24 0:08 ` Brandon Casey
2008-07-22 21:16 ` [PATCH] t4116-apply-reverse.sh: use $TAR rather than tar Brandon Casey
2008-07-25 16:37 ` [PATCH] Set TAR in t/Makefile and in t4116-apply-reverse.sh Stephan Beyer
2008-07-25 17:05 ` Miklos Vajna
2008-07-25 17:12 ` Stephan Beyer
2008-07-25 18:18 ` Junio C Hamano
2008-07-25 18:24 ` Stephan Beyer
2008-07-25 18:54 ` Junio C Hamano
2008-07-25 18:58 ` Stephan Beyer
2008-07-25 19:37 ` Junio C Hamano
2008-07-22 21:16 ` [PATCH] t3200,t7201: replace '!' with test_must_fail Brandon Casey
2008-07-22 21:17 ` [PATCH] t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff Brandon Casey
2008-07-24 0:19 ` Miklos Vajna
2008-07-24 0:55 ` Brandon Casey
2008-07-22 21:21 ` [PATCH] t7502-commit.sh: rearrange test to make more portable Brandon Casey
2008-07-22 21:23 ` [PATCH] t/t4202-log.sh: add newline at end of file Brandon Casey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy73s89hv.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=casey@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).