diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | perl/FromCPAN/.gitattributes (renamed from perl/Git/FromCPAN/.gitattributes) | 0 | ||||
| -rw-r--r-- | perl/FromCPAN/Error.pm (renamed from perl/Git/FromCPAN/Error.pm) | 0 | ||||
| -rw-r--r-- | perl/FromCPAN/Mail/Address.pm (renamed from perl/Git/FromCPAN/Mail/Address.pm) | 0 | ||||
| -rw-r--r-- | perl/Git/LoadCPAN.pm | 5 |
5 files changed, 5 insertions, 3 deletions
@@ -2300,9 +2300,12 @@ po/build/locale/%/LC_MESSAGES/git.mo: po/%.po LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm) LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL)) +LIB_CPAN := $(wildcard perl/FromCPAN/*.pm perl/FromCPAN/*/*.pm) +LIB_CPAN_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_CPAN)) ifndef NO_PERL all:: $(LIB_PERL_GEN) +all:: $(LIB_CPAN_GEN) endif perl/build/lib/%.pm: perl/%.pm diff --git a/perl/Git/FromCPAN/.gitattributes b/perl/FromCPAN/.gitattributes index 8b64fc5e22..8b64fc5e22 100644 --- a/perl/Git/FromCPAN/.gitattributes +++ b/perl/FromCPAN/.gitattributes diff --git a/perl/Git/FromCPAN/Error.pm b/perl/FromCPAN/Error.pm index 8b95e2d73d..8b95e2d73d 100644 --- a/perl/Git/FromCPAN/Error.pm +++ b/perl/FromCPAN/Error.pm diff --git a/perl/Git/FromCPAN/Mail/Address.pm b/perl/FromCPAN/Mail/Address.pm index 683d490b2b..683d490b2b 100644 --- a/perl/Git/FromCPAN/Mail/Address.pm +++ b/perl/FromCPAN/Mail/Address.pm diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm index 1568c177fe..229c1ee87d 100644 --- a/perl/Git/LoadCPAN.pm +++ b/perl/Git/LoadCPAN.pm @@ -16,8 +16,7 @@ source. Therefore the L<Git::LoadCPAN> namespace shipped with Git contains wrapper modules like C<Git::LoadCPAN::Module::Name> that will first attempt to load C<Module::Name> from the OS, and if that doesn't work -will fall back on C<Git::FromCPAN::Module::Name> shipped with Git -itself. +will fall back on C<FromCPAN::Module::Name> shipped with Git itself. Usually distributors will not ship with Git's Git::FromCPAN tree at all, preferring to use their own packaging of CPAN modules instead. @@ -52,7 +51,7 @@ sub import { my $Git_LoadCPAN_pm_root = File::Basename::dirname($Git_LoadCPAN_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_LoadCPAN_pm_path'!"; require File::Spec; - my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_LoadCPAN_pm_root, 'FromCPAN'); + my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_LoadCPAN_pm_root, '..', 'FromCPAN'); die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root; local @INC = ($Git_pm_FromCPAN_root, @INC); |