Move Moudle::Build from lib to ext.

71 files changed, 108 insertions, 121 deletions

diff --git a/MANIFEST b/MANIFEST
index 85a4c98465..09e651f21e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1824,6 +1824,72 @@ ext/MIME-Base64/t/base64.t	See whether MIME::Base64 works
 ext/MIME-Base64/t/quoted-print.t	See whether MIME::QuotedPrint works
 ext/MIME-Base64/t/unicode.t	See whether MIME::Base64 works
 ext/MIME-Base64/t/warn.t	See whether MIME::Base64 works
+ext/Module-Build/Changes				Module::Build
+ext/Module-Build/lib/Module/Build/API.pod		Module::Build
+ext/Module-Build/lib/Module/Build/Authoring.pod		Module::Build
+ext/Module-Build/lib/Module/Build/Base.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Compat.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Config.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Cookbook.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Dumper.pm		Module::Build
+ext/Module-Build/lib/Module/Build/ModuleInfo.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Notes.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Platform/aix.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/Amiga.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/cygwin.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/darwin.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/Default.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/MacOS.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/os2.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/Unix.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/VMS.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/VOS.pm	Module::Build
+ext/Module-Build/lib/Module/Build/Platform/Windows.pm	Module::Build
+ext/Module-Build/lib/Module/Build.pm			Module::Build
+ext/Module-Build/lib/Module/Build/PodParser.pm		Module::Build
+ext/Module-Build/lib/Module/Build/PPMMaker.pm		Module::Build
+ext/Module-Build/lib/Module/Build/Version.pm		Module::Build
+ext/Module-Build/lib/Module/Build/YAML.pm		Module::Build
+ext/Module-Build/scripts/config_data			Module::Build
+ext/Module-Build/t/add_property.t			Module::Build
+ext/Module-Build/t/basic.t				Module::Build
+ext/Module-Build/t/bundled/Tie/CPHash.pm		Module::Build.pm
+ext/Module-Build/t/compat/exit.t			Module::Build
+ext/Module-Build/t/compat.t				Module::Build
+ext/Module-Build/t/debug.t				Module::Build tests
+ext/Module-Build/t/destinations.t			Module::Build
+ext/Module-Build/t/extend.t				Module::Build
+ext/Module-Build/t/ext.t				Module::Build
+ext/Module-Build/t/files.t				Module::Build
+ext/Module-Build/t/help.t				Module::Build
+ext/Module-Build/t/install_extra_target.t		Module::Build tests
+ext/Module-Build/t/install.t				Module::Build
+ext/Module-Build/t/lib/DistGen.pm			Module::Build
+ext/Module-Build/t/lib/MBTest.pm			Module::Build
+ext/Module-Build/t/manifypods.t				Module::Build
+ext/Module-Build/t/mbyaml.t				Module::Build
+ext/Module-Build/t/metadata2.t				Module::Build
+ext/Module-Build/t/metadata.t				Module::Build
+ext/Module-Build/t/moduleinfo.t				Module::Build
+ext/Module-Build/t/new_from_context.t			Module::Build
+ext/Module-Build/t/notes.t				Module::Build
+ext/Module-Build/t/parents.t				Module::Build
+ext/Module-Build/t/PL_files.t				Module::Build tests
+ext/Module-Build/t/pod_parser.t				Module::Build
+ext/Module-Build/t/ppm.t				Module::Build
+ext/Module-Build/t/runthrough.t				Module::Build
+ext/Module-Build/t/script_dist.t			Module::Build
+ext/Module-Build/t/test_file_exts.t			Module::Build
+ext/Module-Build/t/test_types.t				Module::Build
+ext/Module-Build/t/test_type.t				Module::Build
+ext/Module-Build/t/tilde.t				Module::Build
+ext/Module-Build/t/use_tap_harness.t			Module::Build
+ext/Module-Build/t/versions.t				Module::Build
+ext/Module-Build/t/write_default_maniskip.t		Module::Build tests
+ext/Module-Build/t/xs.t					Module::Build
 ext/Module-CoreList/Changes	Module::CoreList Changes
 ext/Module-CoreList/corelist	The corelist command-line utility
 ext/Module-CoreList/identify-dependencies	A usage example for Module::CoreList
@@ -3250,73 +3316,7 @@ lib/lib.t			For "use lib" testing
 lib/locale.pm			For "use locale"
 lib/locale.t			See if locale support works
 lib/look.pl			A "look" equivalent
-lib/Module/Build/API.pod	Module::Build
-lib/Module/Build/Authoring.pod	Module::Build
-lib/Module/Build/Base.pm	Module::Build
-lib/Module/Build/Changes	Module::Build
-lib/Module/Build/Compat.pm	Module::Build
-lib/Module/Build/ConfigData.pm	Module::Build
-lib/Module/Build/Config.pm	Module::Build
-lib/Module/Build/Cookbook.pm	Module::Build
-lib/Module/Build/Dumper.pm	Module::Build
-lib/Module/Build/ModuleInfo.pm	Module::Build
-lib/Module/Build/Notes.pm	Module::Build
-lib/Module/Build/Platform/aix.pm	Module::Build
-lib/Module/Build/Platform/Amiga.pm	Module::Build
-lib/Module/Build/Platform/cygwin.pm	Module::Build
-lib/Module/Build/Platform/darwin.pm	Module::Build
-lib/Module/Build/Platform/Default.pm	Module::Build
-lib/Module/Build/Platform/EBCDIC.pm	Module::Build
-lib/Module/Build/Platform/MacOS.pm	Module::Build
-lib/Module/Build/Platform/MPEiX.pm	Module::Build
-lib/Module/Build/Platform/os2.pm	Module::Build
-lib/Module/Build/Platform/RiscOS.pm	Module::Build
-lib/Module/Build/Platform/Unix.pm	Module::Build
-lib/Module/Build/Platform/VMS.pm	Module::Build
-lib/Module/Build/Platform/VOS.pm	Module::Build
-lib/Module/Build/Platform/Windows.pm	Module::Build
-lib/Module/Build.pm		Module::Build
-lib/Module/Build/PodParser.pm	Module::Build
-lib/Module/Build/PPMMaker.pm	Module::Build
-lib/Module/Build/scripts/config_data	Module::Build
-lib/Module/Build/t/add_property.t	Module::Build
-lib/Module/Build/t/basic.t	Module::Build
-lib/Module/Build/t/bundled/Tie/CPHash.pm	Module::Build.pm
-lib/Module/Build/t/compat/exit.t	Module::Build
-lib/Module/Build/t/compat.t	Module::Build
-lib/Module/Build/t/debug.t	Module::Build tests
-lib/Module/Build/t/destinations.t	Module::Build
-lib/Module/Build/t/extend.t	Module::Build
-lib/Module/Build/t/ext.t	Module::Build
-lib/Module/Build/t/files.t	Module::Build
-lib/Module/Build/t/help.t	Module::Build
-lib/Module/Build/t/install_extra_target.t	Module::Build tests
-lib/Module/Build/t/install.t	Module::Build
-lib/Module/Build/t/lib/DistGen.pm	Module::Build
-lib/Module/Build/t/lib/MBTest.pm	Module::Build
-lib/Module/Build/t/manifypods.t	Module::Build
-lib/Module/Build/t/mbyaml.t	Module::Build
-lib/Module/Build/t/metadata2.t	Module::Build
-lib/Module/Build/t/metadata.t	Module::Build
-lib/Module/Build/t/moduleinfo.t	Module::Build
-lib/Module/Build/t/new_from_context.t	Module::Build
-lib/Module/Build/t/notes.t	Module::Build
-lib/Module/Build/t/parents.t	Module::Build
-lib/Module/Build/t/PL_files.t	Module::Build tests
-lib/Module/Build/t/pod_parser.t	Module::Build
-lib/Module/Build/t/ppm.t	Module::Build
-lib/Module/Build/t/runthrough.t	Module::Build
-lib/Module/Build/t/script_dist.t	Module::Build
-lib/Module/Build/t/test_file_exts.t	Module::Build
-lib/Module/Build/t/test_types.t	Module::Build
-lib/Module/Build/t/test_type.t	Module::Build
-lib/Module/Build/t/tilde.t	Module::Build
-lib/Module/Build/t/use_tap_harness.t	Module::Build
-lib/Module/Build/t/versions.t	Module::Build
-lib/Module/Build/t/write_default_maniskip.t	Module::Build tests
-lib/Module/Build/t/xs.t		Module::Build
-lib/Module/Build/Version.pm	Module::Build
-lib/Module/Build/YAML.pm	Module::Build
+lib/Module/Build/ConfigData.pm	Configuration for Module::Build
 lib/Net/hostent.pm		By-name interface to Perl's builtin gethost*
 lib/Net/hostent.t		See if Net::hostent works
 lib/Net/netent.pm		By-name interface to Perl's builtin getnet*
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index c82bcbf244..3dca9b88b6 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1021,7 +1021,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/Module-Build-0.35.tar.gz',
-	'FILES'		=> q[lib/Module/Build lib/Module/Build.pm],
+	'FILES'		=> q[ext/Module-Build],
 	'EXCLUDED'	=> [ qw{ t/par.t t/signature.t scripts/bundle.pl},
 			     qr!^contrib/! ],
 	'CPAN'		=> 1,
@@ -1911,6 +1911,7 @@ use File::Glob qw(:case);
 				lib/Getopt/Std.{pm,t}
 				lib/I18N/Collate.{pm,t}
 				lib/Internals.t
+				lib/Module/Build/ConfigData.pm
 				lib/Net/hostent.{pm,t}
 				lib/Net/netent.{pm,t}
 				lib/Net/protoent.{pm,t}
diff --git a/ext/.gitignore b/ext/.gitignore
index 5b22e96bf3..c80e6ad355 100644
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -60,6 +60,7 @@ ppport.h
 /Math-BigRat/Makefile.PL
 /Math-Complex/Makefile.PL
 /Memoize/Makefile.PL
+/Module-Build/Makefile.PL
 /Module-Load/Makefile.PL
 /Module-Load-Conditional/Makefile.PL
 /Module-Loaded/Makefile.PL
diff --git a/lib/Module/Build/Changes b/ext/Module-Build/Changes
index df66502dbd..df66502dbd 100644
--- a/lib/Module/Build/Changes
+++ b/ext/Module-Build/Changes
diff --git a/lib/Module/Build.pm b/ext/Module-Build/lib/Module/Build.pm
index be8c1f7079..be8c1f7079 100644
--- a/lib/Module/Build.pm
+++ b/ext/Module-Build/lib/Module/Build.pm
diff --git a/lib/Module/Build/API.pod b/ext/Module-Build/lib/Module/Build/API.pod
index f4e4cea09d..f4e4cea09d 100644
--- a/lib/Module/Build/API.pod
+++ b/ext/Module-Build/lib/Module/Build/API.pod
diff --git a/lib/Module/Build/Authoring.pod b/ext/Module-Build/lib/Module/Build/Authoring.pod
index 38fb3f089a..38fb3f089a 100644
--- a/lib/Module/Build/Authoring.pod
+++ b/ext/Module-Build/lib/Module/Build/Authoring.pod
diff --git a/lib/Module/Build/Base.pm b/ext/Module-Build/lib/Module/Build/Base.pm
index 531c35487e..531c35487e 100644
--- a/lib/Module/Build/Base.pm
+++ b/ext/Module-Build/lib/Module/Build/Base.pm
diff --git a/lib/Module/Build/Compat.pm b/ext/Module-Build/lib/Module/Build/Compat.pm
index dfe75d5e1a..dfe75d5e1a 100644
--- a/lib/Module/Build/Compat.pm
+++ b/ext/Module-Build/lib/Module/Build/Compat.pm
diff --git a/lib/Module/Build/Config.pm b/ext/Module-Build/lib/Module/Build/Config.pm
index de8b44d092..de8b44d092 100644
--- a/lib/Module/Build/Config.pm
+++ b/ext/Module-Build/lib/Module/Build/Config.pm
diff --git a/lib/Module/Build/Cookbook.pm b/ext/Module-Build/lib/Module/Build/Cookbook.pm
index 82c8e01d67..82c8e01d67 100644
--- a/lib/Module/Build/Cookbook.pm
+++ b/ext/Module-Build/lib/Module/Build/Cookbook.pm
diff --git a/lib/Module/Build/Dumper.pm b/ext/Module-Build/lib/Module/Build/Dumper.pm
index 1cd8cd0e16..1cd8cd0e16 100644
--- a/lib/Module/Build/Dumper.pm
+++ b/ext/Module-Build/lib/Module/Build/Dumper.pm
diff --git a/lib/Module/Build/ModuleInfo.pm b/ext/Module-Build/lib/Module/Build/ModuleInfo.pm
index 4de09b4c68..4de09b4c68 100644
--- a/lib/Module/Build/ModuleInfo.pm
+++ b/ext/Module-Build/lib/Module/Build/ModuleInfo.pm
diff --git a/lib/Module/Build/Notes.pm b/ext/Module-Build/lib/Module/Build/Notes.pm
index fe98419759..fe98419759 100644
--- a/lib/Module/Build/Notes.pm
+++ b/ext/Module-Build/lib/Module/Build/Notes.pm
diff --git a/lib/Module/Build/PPMMaker.pm b/ext/Module-Build/lib/Module/Build/PPMMaker.pm
index 35b5a75317..35b5a75317 100644
--- a/lib/Module/Build/PPMMaker.pm
+++ b/ext/Module-Build/lib/Module/Build/PPMMaker.pm
diff --git a/lib/Module/Build/Platform/Amiga.pm b/ext/Module-Build/lib/Module/Build/Platform/Amiga.pm
index 5ce8cf58a2..5ce8cf58a2 100644
--- a/lib/Module/Build/Platform/Amiga.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/Amiga.pm
diff --git a/lib/Module/Build/Platform/Default.pm b/ext/Module-Build/lib/Module/Build/Platform/Default.pm
index df29af5f68..df29af5f68 100644
--- a/lib/Module/Build/Platform/Default.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/Default.pm
diff --git a/lib/Module/Build/Platform/EBCDIC.pm b/ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm
index d68836c1a3..d68836c1a3 100644
--- a/lib/Module/Build/Platform/EBCDIC.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm
diff --git a/lib/Module/Build/Platform/MPEiX.pm b/ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm
index a835c30d49..a835c30d49 100644
--- a/lib/Module/Build/Platform/MPEiX.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm
diff --git a/lib/Module/Build/Platform/MacOS.pm b/ext/Module-Build/lib/Module/Build/Platform/MacOS.pm
index 9c9281adac..9c9281adac 100644
--- a/lib/Module/Build/Platform/MacOS.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/MacOS.pm
diff --git a/lib/Module/Build/Platform/RiscOS.pm b/ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm
index c240750c46..c240750c46 100644
--- a/lib/Module/Build/Platform/RiscOS.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm
diff --git a/lib/Module/Build/Platform/Unix.pm b/ext/Module-Build/lib/Module/Build/Platform/Unix.pm
index 879ca3ad4e..879ca3ad4e 100644
--- a/lib/Module/Build/Platform/Unix.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/Unix.pm
diff --git a/lib/Module/Build/Platform/VMS.pm b/ext/Module-Build/lib/Module/Build/Platform/VMS.pm
index 3305154b2d..3305154b2d 100644
--- a/lib/Module/Build/Platform/VMS.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/VMS.pm
diff --git a/lib/Module/Build/Platform/VOS.pm b/ext/Module-Build/lib/Module/Build/Platform/VOS.pm
index be46a80416..be46a80416 100644
--- a/lib/Module/Build/Platform/VOS.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/VOS.pm
diff --git a/lib/Module/Build/Platform/Windows.pm b/ext/Module-Build/lib/Module/Build/Platform/Windows.pm
index 6cf9da9cc3..6cf9da9cc3 100644
--- a/lib/Module/Build/Platform/Windows.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/Windows.pm
diff --git a/lib/Module/Build/Platform/aix.pm b/ext/Module-Build/lib/Module/Build/Platform/aix.pm
index 45feb3cdd4..45feb3cdd4 100644
--- a/lib/Module/Build/Platform/aix.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/aix.pm
diff --git a/lib/Module/Build/Platform/cygwin.pm b/ext/Module-Build/lib/Module/Build/Platform/cygwin.pm
index 62a6461ce2..62a6461ce2 100644
--- a/lib/Module/Build/Platform/cygwin.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/cygwin.pm
diff --git a/lib/Module/Build/Platform/darwin.pm b/ext/Module-Build/lib/Module/Build/Platform/darwin.pm
index 39e9e36911..39e9e36911 100644
--- a/lib/Module/Build/Platform/darwin.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/darwin.pm
diff --git a/lib/Module/Build/Platform/os2.pm b/ext/Module-Build/lib/Module/Build/Platform/os2.pm
index ace01a3291..ace01a3291 100644
--- a/lib/Module/Build/Platform/os2.pm
+++ b/ext/Module-Build/lib/Module/Build/Platform/os2.pm
diff --git a/lib/Module/Build/PodParser.pm b/ext/Module-Build/lib/Module/Build/PodParser.pm
index b17b80b189..b17b80b189 100644
--- a/lib/Module/Build/PodParser.pm
+++ b/ext/Module-Build/lib/Module/Build/PodParser.pm
diff --git a/lib/Module/Build/Version.pm b/ext/Module-Build/lib/Module/Build/Version.pm
index 0664d432ab..0664d432ab 100644
--- a/lib/Module/Build/Version.pm
+++ b/ext/Module-Build/lib/Module/Build/Version.pm
diff --git a/lib/Module/Build/YAML.pm b/ext/Module-Build/lib/Module/Build/YAML.pm
index 4a181ad1c9..4a181ad1c9 100644
--- a/lib/Module/Build/YAML.pm
+++ b/ext/Module-Build/lib/Module/Build/YAML.pm
diff --git a/lib/Module/Build/scripts/config_data b/ext/Module-Build/scripts/config_data
index 374922f20c..374922f20c 100644
--- a/lib/Module/Build/scripts/config_data
+++ b/ext/Module-Build/scripts/config_data
diff --git a/lib/Module/Build/t/PL_files.t b/ext/Module-Build/t/PL_files.t
index 4d0e13fd47..a22171458c 100644
--- a/lib/Module/Build/t/PL_files.t
+++ b/ext/Module-Build/t/PL_files.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 8;
 use DistGen;
 use Module::Build;
diff --git a/lib/Module/Build/t/add_property.t b/ext/Module-Build/t/add_property.t
index c1c11c4871..6032b0929d 100644
--- a/lib/Module/Build/t/add_property.t
+++ b/ext/Module-Build/t/add_property.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 29;
 #use MBTest 'no_plan';
 use DistGen;
diff --git a/lib/Module/Build/t/basic.t b/ext/Module-Build/t/basic.t
index 205d101372..f46be0a4c9 100644
--- a/lib/Module/Build/t/basic.t
+++ b/ext/Module-Build/t/basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 60;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/bundled/Tie/CPHash.pm b/ext/Module-Build/t/bundled/Tie/CPHash.pm
index 36aea85a8c..36aea85a8c 100644
--- a/lib/Module/Build/t/bundled/Tie/CPHash.pm
+++ b/ext/Module-Build/t/bundled/Tie/CPHash.pm
diff --git a/lib/Module/Build/t/compat.t b/ext/Module-Build/t/compat.t
index b529cfa2e6..88e5953408 100644
--- a/lib/Module/Build/t/compat.t
+++ b/ext/Module-Build/t/compat.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest;
 use File::Spec;
 use IO::File;
diff --git a/lib/Module/Build/t/compat/exit.t b/ext/Module-Build/t/compat/exit.t
index b0fbf4c550..78269a97a3 100644
--- a/lib/Module/Build/t/compat/exit.t
+++ b/ext/Module-Build/t/compat/exit.t
@@ -2,7 +2,7 @@
 
 use strict;
 
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 5;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/debug.t b/ext/Module-Build/t/debug.t
index 7146e6636a..c9b4fa581c 100644
--- a/lib/Module/Build/t/debug.t
+++ b/ext/Module-Build/t/debug.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 3;
 
 require_ok('Module::Build');
diff --git a/lib/Module/Build/t/destinations.t b/ext/Module-Build/t/destinations.t
index 1c6705ff02..4af99d0031 100644
--- a/lib/Module/Build/t/destinations.t
+++ b/ext/Module-Build/t/destinations.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 115;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/ext.t b/ext/Module-Build/t/ext.t
index 30c648bbb3..8045761c2a 100644
--- a/lib/Module/Build/t/ext.t
+++ b/ext/Module-Build/t/ext.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest;
 
 use Module::Build;
diff --git a/lib/Module/Build/t/extend.t b/ext/Module-Build/t/extend.t
index f939defaaf..db99eec70b 100644
--- a/lib/Module/Build/t/extend.t
+++ b/ext/Module-Build/t/extend.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 66;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/files.t b/ext/Module-Build/t/files.t
index 9ee452e63b..87b192eaba 100644
--- a/lib/Module/Build/t/files.t
+++ b/ext/Module-Build/t/files.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 6;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/help.t b/ext/Module-Build/t/help.t
index 201e5ae416..8408315f07 100644
--- a/lib/Module/Build/t/help.t
+++ b/ext/Module-Build/t/help.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 25;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/install.t b/ext/Module-Build/t/install.t
index 317ca8b01e..2cadaa39da 100644
--- a/lib/Module/Build/t/install.t
+++ b/ext/Module-Build/t/install.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 36;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/install_extra_target.t b/ext/Module-Build/t/install_extra_target.t
index 23e9d11a37..c717ce5eee 100644
--- a/lib/Module/Build/t/install_extra_target.t
+++ b/ext/Module-Build/t/install_extra_target.t
@@ -2,7 +2,7 @@
 # Contributed by: Thorben Jaendling
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 8;
 
 require_ok 'Module::Build';
diff --git a/lib/Module/Build/t/lib/DistGen.pm b/ext/Module-Build/t/lib/DistGen.pm
index 86ee794f3b..86ee794f3b 100644
--- a/lib/Module/Build/t/lib/DistGen.pm
+++ b/ext/Module-Build/t/lib/DistGen.pm
diff --git a/lib/Module/Build/t/lib/MBTest.pm b/ext/Module-Build/t/lib/MBTest.pm
index 42f6eb6ce2..dc2410b399 100644
--- a/lib/Module/Build/t/lib/MBTest.pm
+++ b/ext/Module-Build/t/lib/MBTest.pm
@@ -49,25 +49,7 @@ BEGIN {
 
   # In case the test wants to use our other bundled
   # modules, make sure they can be loaded.
-  my $t_lib = File::Spec->catdir('t', 'bundled');
-
-  unless ($ENV{PERL_CORE}) {
-    push @INC, $t_lib; # Let user's installed version override
-  } else {
-    # We change directories, so expand @INC and $^X to absolute paths
-    # Also add .
-    @INC = (map(File::Spec->rel2abs($_), @INC), ".");
-    $^X = File::Spec->rel2abs($^X);
-
-    # we are in 't', go up a level so we don't create t/t/_tmp
-    chdir '..' or die "Couldn't chdir to ..";
-
-    push @INC, File::Spec->catdir(qw/lib Module Build/, $t_lib);
-
-    # make sure children get @INC pointing to uninstalled files
-    require Cwd;
-    $ENV{PERL5LIB} = File::Spec->catdir(Cwd::cwd(), 'lib');
-  }
+  push @INC, File::Spec->catdir('t', 'bundled');
 }
 
 use Exporter;
diff --git a/lib/Module/Build/t/manifypods.t b/ext/Module-Build/t/manifypods.t
index 263c1376c0..31c9e8ea83 100644
--- a/lib/Module/Build/t/manifypods.t
+++ b/ext/Module-Build/t/manifypods.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest;
 use Module::Build;
 use Module::Build::ConfigData;
diff --git a/lib/Module/Build/t/mbyaml.t b/ext/Module-Build/t/mbyaml.t
index f210ed7d0e..d2cb0d547f 100644
--- a/lib/Module/Build/t/mbyaml.t
+++ b/ext/Module-Build/t/mbyaml.t
@@ -1,7 +1,7 @@
 #!/usr/local/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest 'no_plan';
 
 use_ok 'Module::Build::YAML';
diff --git a/lib/Module/Build/t/metadata.t b/ext/Module-Build/t/metadata.t
index 609d6e9122..6f53c1d225 100644
--- a/lib/Module/Build/t/metadata.t
+++ b/ext/Module-Build/t/metadata.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 53;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/metadata2.t b/ext/Module-Build/t/metadata2.t
index 4d2894d4e9..a5af034dc0 100644
--- a/lib/Module/Build/t/metadata2.t
+++ b/ext/Module-Build/t/metadata2.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 20;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/moduleinfo.t b/ext/Module-Build/t/moduleinfo.t
index 196cf43b34..ca7eb048e5 100644
--- a/lib/Module/Build/t/moduleinfo.t
+++ b/ext/Module-Build/t/moduleinfo.t
@@ -3,7 +3,7 @@
 # vim:ts=8:sw=2:et:sta:sts=2
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 82;
 
 use_ok 'Module::Build::ModuleInfo';
diff --git a/lib/Module/Build/t/new_from_context.t b/ext/Module-Build/t/new_from_context.t
index a1a2433d63..ee34f07367 100644
--- a/lib/Module/Build/t/new_from_context.t
+++ b/ext/Module-Build/t/new_from_context.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 4;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/notes.t b/ext/Module-Build/t/notes.t
index 2a20d72880..29f1fc38b1 100644
--- a/lib/Module/Build/t/notes.t
+++ b/ext/Module-Build/t/notes.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 13;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/parents.t b/ext/Module-Build/t/parents.t
index 7270c67cfe..666fb05601 100644
--- a/lib/Module/Build/t/parents.t
+++ b/ext/Module-Build/t/parents.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 28;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/pod_parser.t b/ext/Module-Build/t/pod_parser.t
index c90608f7e8..42a78209e2 100644
--- a/lib/Module/Build/t/pod_parser.t
+++ b/ext/Module-Build/t/pod_parser.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 8;
 
 use_ok 'Module::Build::PodParser';
diff --git a/lib/Module/Build/t/ppm.t b/ext/Module-Build/t/ppm.t
index 3a8446291f..7fb6450648 100644
--- a/lib/Module/Build/t/ppm.t
+++ b/ext/Module-Build/t/ppm.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest;
 
 use Module::Build;
diff --git a/lib/Module/Build/t/runthrough.t b/ext/Module-Build/t/runthrough.t
index ce15295e4c..21d3d1c113 100644
--- a/lib/Module/Build/t/runthrough.t
+++ b/ext/Module-Build/t/runthrough.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 32;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/script_dist.t b/ext/Module-Build/t/script_dist.t
index 0a86cafe45..e6b7fd8832 100644
--- a/lib/Module/Build/t/script_dist.t
+++ b/ext/Module-Build/t/script_dist.t
@@ -3,7 +3,7 @@
 # vim:ts=8:sw=2:et:sta:sts=2
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest 'no_plan';
 
 use DistGen qw(undent);
diff --git a/lib/Module/Build/t/test_file_exts.t b/ext/Module-Build/t/test_file_exts.t
index 54614d18ef..9dbf73e290 100644
--- a/lib/Module/Build/t/test_file_exts.t
+++ b/ext/Module-Build/t/test_file_exts.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 5;
 use DistGen;
 
diff --git a/lib/Module/Build/t/test_type.t b/ext/Module-Build/t/test_type.t
index 598ddb12f1..3c6cfb61e4 100644
--- a/lib/Module/Build/t/test_type.t
+++ b/ext/Module-Build/t/test_type.t
@@ -8,7 +8,7 @@ BEGIN {
 }
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 9;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/test_types.t b/ext/Module-Build/t/test_types.t
index 1d2902e034..5f3f5cff8d 100644
--- a/lib/Module/Build/t/test_types.t
+++ b/ext/Module-Build/t/test_types.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 15 + 12;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/tilde.t b/ext/Module-Build/t/tilde.t
index 299d4b5bd6..5b39204171 100644
--- a/lib/Module/Build/t/tilde.t
+++ b/ext/Module-Build/t/tilde.t
@@ -3,7 +3,7 @@
 # Test ~ expansion from command line arguments.
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 18;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/use_tap_harness.t b/ext/Module-Build/t/use_tap_harness.t
index 31f321044a..d14cb052ba 100644
--- a/lib/Module/Build/t/use_tap_harness.t
+++ b/ext/Module-Build/t/use_tap_harness.t
@@ -2,7 +2,7 @@
 
 use strict;
 use Test::More;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 if (eval { require TAP::Harness } && TAP::Harness->VERSION >= 3) {
     plan tests => 8;
 } else {
diff --git a/lib/Module/Build/t/versions.t b/ext/Module-Build/t/versions.t
index 0bf47813a7..7f511e58f6 100644
--- a/lib/Module/Build/t/versions.t
+++ b/ext/Module-Build/t/versions.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest tests => 4;
 
 use_ok 'Module::Build';
diff --git a/lib/Module/Build/t/write_default_maniskip.t b/ext/Module-Build/t/write_default_maniskip.t
index 0a293b0dad..084d81ed3e 100644
--- a/lib/Module/Build/t/write_default_maniskip.t
+++ b/ext/Module-Build/t/write_default_maniskip.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest 'no_plan';
 use DistGen;
 use Cwd;
diff --git a/lib/Module/Build/t/xs.t b/ext/Module-Build/t/xs.t
index f637d7e665..e3f1ed7dd1 100644
--- a/lib/Module/Build/t/xs.t
+++ b/ext/Module-Build/t/xs.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+use lib 't/lib';
 use MBTest;
 use Module::Build;
 use Config;
diff --git a/lib/.gitignore b/lib/.gitignore
index 6b3e631f52..0d19f9d6dd 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -249,6 +249,9 @@
 /Memoize/NDBM_File.pm
 /Memoize/SDBM_File.pm
 /Memoize/Storable.pm
+/Module/Build
+/Module/Build.pm
+!/Module/Build/ConfigData.pm
 /Module/CoreList.pm
 /Module/Load.pm
 /Module/Load/Conditional.pm
diff --git a/utils/config_data.PL b/utils/config_data.PL
index e1de813b52..e8dda916fb 100644
--- a/utils/config_data.PL
+++ b/utils/config_data.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[lib Module Build scripts]
+                File::Spec->updir, qw[ext Module-Build scripts]
             ), "config_data");
 
 if (open(IN, $script)) {