From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Tom G. Christensen" <tgc@statsbiblioteket.dk>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/2] perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
Date: Sat, 10 Mar 2012 12:29:35 +0000 [thread overview]
Message-ID: <1331382575-16936-3-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1331382575-16936-1-git-send-email-avarab@gmail.com>
When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot
to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was
set. Change the generation of the fallback perl.mak file to do that.
Now Git/I18N.pm is installed alongside Git.pm in such a way that
anything that uses GITPERLLIB will find it.
Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
perl/Makefile | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/perl/Makefile b/perl/Makefile
index b2977cd..9af9025 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -23,20 +23,25 @@ clean:
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst ','\'',$(prefix)/lib)
$(makfile): ../GIT-CFLAGS Makefile
- echo all: private-Error.pm Git.pm > $@
+ echo all: private-Error.pm Git.pm Git/I18N.pm > $@
echo ' mkdir -p blib/lib' >> $@
+ echo ' mkdir -p blib/lib/Git' >> $@
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
+ echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
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 "$$(DESTDIR)$(instdir_SQ)"' >> $@
+ echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
+ echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
echo instlibdir: >> $@
echo ' echo $(instdir_SQ)' >> $@
+ echo ' echo $(instdir_SQ)/Git' >> $@
else
$(makfile): Makefile.PL ../GIT-CFLAGS
$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)'
--
1.7.9
next prev parent reply other threads:[~2012-03-10 12:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 13:11 I18N.pm is incompatible with perl < 5.8.3 Tom G. Christensen
2012-02-02 16:48 ` Ævar Arnfjörð Bjarmason
2012-02-02 21:23 ` Tom G. Christensen
2012-03-07 12:56 ` Tom G. Christensen
2012-03-07 20:53 ` Ævar Arnfjörð Bjarmason
2012-03-10 12:29 ` [PATCH 0/2] Minor fixes for Perl + Git::I18N Ævar Arnfjörð Bjarmason
2012-03-10 12:29 ` [PATCH 1/2] Git::I18N: compatibility with perl <5.8.3 Ævar Arnfjörð Bjarmason
2012-03-10 12:29 ` Ævar Arnfjörð Bjarmason [this message]
2012-03-10 21:38 ` [PATCH 2/2] perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER Junio C Hamano
2012-03-11 19:27 ` Ævar Arnfjörð Bjarmason
2012-03-16 16:14 ` Junio C Hamano
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=1331382575-16936-3-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tgc@statsbiblioteket.dk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.