Move ExtUtils::MakeMaker from ext/ to cpan/

107 files changed, 110 insertions, 109 deletions

diff --git a/MANIFEST b/MANIFEST
index 7b0baa26de..2464f95784 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -692,6 +692,108 @@ cpan/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm			Compile and link C code for Pe
 cpan/ExtUtils-CBuilder/t/00-have-compiler.t			ExtUtils::CBuilder tests
 cpan/ExtUtils-CBuilder/t/01-basic.t				tests for ExtUtils::CBuilder
 cpan/ExtUtils-CBuilder/t/02-link.t				tests for ExtUtils::CBuilder
+cpan/ExtUtils-MakeMaker/bin/instmodsh				Give information about installed extensions
+cpan/ExtUtils-MakeMaker/Changes					MakeMaker change log
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm		Calling MM functions from the cmd line
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm		Does the real work of the above
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm			Locates libraries
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm	MakeMaker wrapper for Config
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod		MakeMaker FAQ
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm		Write Makefiles for extensions
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod	Writing a module with MakeMaker
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm		Writes a bootstrap file (see MakeMaker)
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm		Writes a linker options file for extensions
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm			MakeMaker methods for AIX
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm			MakeMaker methods for Any OS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm			MakeMaker methods for BeOS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm		MakeMaker methods for Cygwin
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm		MakeMaker methods for Darwin
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm			MakeMaker methods for DOS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm		MakeMaker methods for MacOS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm			MakeMaker methods for NetWare
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm			MakeMaker methods for OS/2
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm			MakeMaker adaptor class
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm			MakeMaker methods for QNX
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm			MakeMaker methods for Unix
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm			MakeMaker methods for U/WIN
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm			MakeMaker methods for VMS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm			MakeMaker methods for VOS
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm		MakeMaker methods for Win32
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm		MakeMaker methods for Win95
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm			MakeMaker user override class
+cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm			Fixes up @INC to use just-built extension
+cpan/ExtUtils-MakeMaker/MANIFEST				ExtUtils::MakeMaker MANIFEST
+cpan/ExtUtils-MakeMaker/NOTES					Notes about MakeMaker internals
+cpan/ExtUtils-MakeMaker/PATCHING				Suggestions for patching MakeMaker
+cpan/ExtUtils-MakeMaker/README					MakeMaker README
+cpan/ExtUtils-MakeMaker/t/00compile.t				See if MakeMaker modules compile
+cpan/ExtUtils-MakeMaker/t/arch_check.t				Test MakeMaker's arch_check()
+cpan/ExtUtils-MakeMaker/t/backwards.t				Check MakeMaker's backwards compatibility
+cpan/ExtUtils-MakeMaker/t/basic.t				See if MakeMaker can build a module
+cpan/ExtUtils-MakeMaker/t/build_man.t				Set if MakeMaker builds manpages
+cpan/ExtUtils-MakeMaker/t/cd.t					Test to see cd works
+cpan/ExtUtils-MakeMaker/t/config.t				Test ExtUtils::MakeMaker::Config
+cpan/ExtUtils-MakeMaker/t/dir_target.t				Verify if dir_target() is supported
+cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t			See if FIRST_MAKEFILE works
+cpan/ExtUtils-MakeMaker/t/fixin.t				See if ExtUtils::MakeMaker works
+cpan/ExtUtils-MakeMaker/t/fix_libs.t				Test for ExtUtils::MakeMaker
+cpan/ExtUtils-MakeMaker/t/hints.t				See if hint files are honored.
+cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t			Test INSTALL_BASE in MakeMaker
+cpan/ExtUtils-MakeMaker/t/installed_file.t			Test for ExtUtils::MakeMaker
+cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t				See if MakeMaker can apply PREFIXs
+cpan/ExtUtils-MakeMaker/t/INST.t				Check MakeMaker INST_* macros
+cpan/ExtUtils-MakeMaker/t/is_of_type.t				Test for ExtUtils::MakeMaker
+cpan/ExtUtils-MakeMaker/t/Liblist.t				See if ExtUtils::Liblist works
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm		MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm	MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm		MakeMaker test utilities
+cpan/ExtUtils-MakeMaker/t/lib/TieIn.pm				Testing library for dummy input handles
+cpan/ExtUtils-MakeMaker/t/lib/TieOut.pm				Testing library to capture prints
+cpan/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t		test "MakeMaker Parameters" section
+cpan/ExtUtils-MakeMaker/t/make.t				See if make detection works
+cpan/ExtUtils-MakeMaker/t/maketext_filter.t			See if maketext_filter works
+cpan/ExtUtils-MakeMaker/t/metafile_data.t			See if META.yml handling works
+cpan/ExtUtils-MakeMaker/t/metafile_file.t			See if META.yml handling works
+cpan/ExtUtils-MakeMaker/t/miniperl.t				Test MakeMaker with miniperl
+cpan/ExtUtils-MakeMaker/t/min_perl_version.t			Test the MIN_PERL_VERSION argument to WriteMakefile.
+cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t				See if ExtUtils::Mkbootstrap works
+cpan/ExtUtils-MakeMaker/t/MM_Any.t				See if ExtUtils::MM_Any works
+cpan/ExtUtils-MakeMaker/t/MM_BeOS.t				See if ExtUtils::MM_BeOS works
+cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t				See if ExtUtils::MM_Cygwin works
+cpan/ExtUtils-MakeMaker/t/MM_NW5.t				See if ExtUtils::MM_NW5 works
+cpan/ExtUtils-MakeMaker/t/MM_OS2.t				See if ExtUtils::MM_OS2 works
+cpan/ExtUtils-MakeMaker/t/MM_Unix.t				See if ExtUtils::MM_UNIX works
+cpan/ExtUtils-MakeMaker/t/MM_VMS.t				See if ExtUtils::MM_VMS works
+cpan/ExtUtils-MakeMaker/t/MM_Win32.t				See if ExtUtils::MM_Win32 works
+cpan/ExtUtils-MakeMaker/TODO					Things TODO in MakeMaker
+cpan/ExtUtils-MakeMaker/t/oneliner.t				See if MM can generate perl one-liners
+cpan/ExtUtils-MakeMaker/t/parse_version.t			See if parse_version works
+cpan/ExtUtils-MakeMaker/t/PL_FILES.t				Test PL_FILES in MakeMaker
+cpan/ExtUtils-MakeMaker/t/pm.t					See if MakeMaker can handle PM
+cpan/ExtUtils-MakeMaker/t/pm_to_blib.t				Test for ExtUtils::MakeMaker
+cpan/ExtUtils-MakeMaker/t/pod2man.t				See if MakeMaker can handle no pod2man
+cpan/ExtUtils-MakeMaker/t/postamble.t				See if postamble works
+cpan/ExtUtils-MakeMaker/t/prefixify.t				See if MakeMaker can apply a PREFIX
+cpan/ExtUtils-MakeMaker/t/prereq_print.t				See if PREREQ_PRINT works
+cpan/ExtUtils-MakeMaker/t/prereq.t				See if MakeMaker works
+cpan/ExtUtils-MakeMaker/t/problems.t				How MakeMaker reacts to build problems
+cpan/ExtUtils-MakeMaker/t/prompt.t				See if E::MM::prompt() works
+cpan/ExtUtils-MakeMaker/t/recurs.t				See if recursive builds work
+cpan/ExtUtils-MakeMaker/t/revision.t				See if $Revision is correct
+cpan/ExtUtils-MakeMaker/t/split_command.t			See if MM's xargs-like function works
+cpan/ExtUtils-MakeMaker/t/test_boilerplate.t			MakeMaker test
+cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm	test data for MakeMaker
+cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm	test data for MakeMaker
+cpan/ExtUtils-MakeMaker/t/testlib.t				See if ExtUtils::testlib works
+cpan/ExtUtils-MakeMaker/t/VERSION_FROM.t			See if MakeMaker's VERSION_FROM works
+cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t			See if WriteEmptyMakefile works
+cpan/ExtUtils-MakeMaker/t/writemakefile_args.t			See if WriteMakefile works
+cpan/ExtUtils-MakeMaker/t/xs.t					Part of MakeMaker's test suite
 cpan/ExtUtils-ParseXS/Changes			ExtUtils::ParseXS change log
 cpan/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm	converts Perl XS code into C code
 cpan/ExtUtils-ParseXS/lib/ExtUtils/xsubpp	External subroutine preprocessor
@@ -1673,111 +1775,9 @@ ext/ExtUtils-Constant/lib/ExtUtils/Constant/ProxySubs.pm	generate XS code for pr
 ext/ExtUtils-Constant/lib/ExtUtils/Constant/Utils.pm		generate XS code to import C header constants
 ext/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm		generate XS code to import C header constants
 ext/ExtUtils-Constant/t/Constant.t				See if ExtUtils::Constant works
-ext/ExtUtils-MakeMaker/bin/instmodsh			Give information about installed extensions
-ext/ExtUtils-MakeMaker/Changes				MakeMaker change log
-ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm	Calling MM functions from the cmd line
-ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm	Does the real work of the above
-ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm		Locates libraries
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm	MakeMaker wrapper for Config
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod	MakeMaker FAQ
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm	Write Makefiles for extensions
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod	Writing a module with MakeMaker
-ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm	Writes a bootstrap file (see MakeMaker)
-ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm	Writes a linker options file for extensions
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm		MakeMaker methods for AIX
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm		MakeMaker methods for Any OS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm		MakeMaker methods for BeOS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm	MakeMaker methods for Cygwin
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm	MakeMaker methods for Darwin
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm		MakeMaker methods for DOS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm		MakeMaker methods for MacOS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm		MakeMaker methods for NetWare
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm		MakeMaker methods for OS/2
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm		MakeMaker adaptor class
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm		MakeMaker methods for QNX
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm		MakeMaker methods for Unix
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm		MakeMaker methods for U/WIN
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm		MakeMaker methods for VMS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm		MakeMaker methods for VOS
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm		MakeMaker methods for Win32
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm		MakeMaker methods for Win95
-ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm		MakeMaker user override class
-ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm		Fixes up @INC to use just-built extension
-ext/ExtUtils-MakeMaker/MANIFEST				ExtUtils::MakeMaker MANIFEST
-ext/ExtUtils-MakeMaker/NOTES				Notes about MakeMaker internals
-ext/ExtUtils-MakeMaker/PATCHING				Suggestions for patching MakeMaker
-ext/ExtUtils-MakeMaker/README				MakeMaker README
-ext/ExtUtils-MakeMaker/t/00compile.t			See if MakeMaker modules compile
-ext/ExtUtils-MakeMaker/t/arch_check.t			Test MakeMaker's arch_check()
-ext/ExtUtils-MakeMaker/t/backwards.t			Check MakeMaker's backwards compatibility
-ext/ExtUtils-MakeMaker/t/basic.t			See if MakeMaker can build a module
-ext/ExtUtils-MakeMaker/t/build_man.t			Set if MakeMaker builds manpages
-ext/ExtUtils-MakeMaker/t/cd.t				Test to see cd works
-ext/ExtUtils-MakeMaker/t/config.t			Test ExtUtils::MakeMaker::Config
-ext/ExtUtils-MakeMaker/t/dir_target.t			Verify if dir_target() is supported
-ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t		See if FIRST_MAKEFILE works
-ext/ExtUtils-MakeMaker/t/fixin.t			See if ExtUtils::MakeMaker works
-ext/ExtUtils-MakeMaker/t/fix_libs.t			Test for ExtUtils::MakeMaker
-ext/ExtUtils-MakeMaker/t/hints.t			See if hint files are honored.
-ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t			Test INSTALL_BASE in MakeMaker
-ext/ExtUtils-MakeMaker/t/installed_file.t		Test for ExtUtils::MakeMaker
-ext/ExtUtils-MakeMaker/t/INST_PREFIX.t			See if MakeMaker can apply PREFIXs
-ext/ExtUtils-MakeMaker/t/INST.t				Check MakeMaker INST_* macros
-ext/ExtUtils-MakeMaker/t/is_of_type.t			Test for ExtUtils::MakeMaker
-ext/ExtUtils-MakeMaker/t/Liblist.t			See if ExtUtils::Liblist works
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm		MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm	MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm	MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm	MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm	MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm	MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm		MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm		MakeMaker test utilities
-ext/ExtUtils-MakeMaker/t/lib/TieIn.pm			Testing library for dummy input handles
-ext/ExtUtils-MakeMaker/t/lib/TieOut.pm			Testing library to capture prints
-ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t		test "MakeMaker Parameters" section
-ext/ExtUtils-MakeMaker/t/make.t				See if make detection works
-ext/ExtUtils-MakeMaker/t/maketext_filter.t		See if maketext_filter works
-ext/ExtUtils-MakeMaker/t/metafile_data.t		See if META.yml handling works
-ext/ExtUtils-MakeMaker/t/metafile_file.t		See if META.yml handling works
-ext/ExtUtils-MakeMaker/t/miniperl.t			Test MakeMaker with miniperl
-ext/ExtUtils-MakeMaker/t/min_perl_version.t		Test the MIN_PERL_VERSION argument to WriteMakefile.
-ext/ExtUtils-MakeMaker/t/Mkbootstrap.t			See if ExtUtils::Mkbootstrap works
-ext/ExtUtils-MakeMaker/t/MM_Any.t			See if ExtUtils::MM_Any works
-ext/ExtUtils-MakeMaker/t/MM_BeOS.t			See if ExtUtils::MM_BeOS works
-ext/ExtUtils-MakeMaker/t/MM_Cygwin.t			See if ExtUtils::MM_Cygwin works
-ext/ExtUtils-MakeMaker/t/MM_NW5.t			See if ExtUtils::MM_NW5 works
-ext/ExtUtils-MakeMaker/t/MM_OS2.t			See if ExtUtils::MM_OS2 works
-ext/ExtUtils-MakeMaker/t/MM_Unix.t			See if ExtUtils::MM_UNIX works
-ext/ExtUtils-MakeMaker/t/MM_VMS.t			See if ExtUtils::MM_VMS works
-ext/ExtUtils-MakeMaker/t/MM_Win32.t			See if ExtUtils::MM_Win32 works
-ext/ExtUtils-MakeMaker/TODO				Things TODO in MakeMaker
-ext/ExtUtils-MakeMaker/t/oneliner.t			See if MM can generate perl one-liners
-ext/ExtUtils-MakeMaker/t/parse_version.t		See if parse_version works
-ext/ExtUtils-MakeMaker/t/PL_FILES.t			Test PL_FILES in MakeMaker
-ext/ExtUtils-MakeMaker/t/pm.t				See if MakeMaker can handle PM
-ext/ExtUtils-MakeMaker/t/pm_to_blib.t			Test for ExtUtils::MakeMaker
-ext/ExtUtils-MakeMaker/t/pod2man.t			See if MakeMaker can handle no pod2man
-ext/ExtUtils-MakeMaker/t/postamble.t			See if postamble works
-ext/ExtUtils-MakeMaker/t/prefixify.t			See if MakeMaker can apply a PREFIX
-ext/ExtUtils-MakeMaker/t/prereq_print.t			See if PREREQ_PRINT works
-ext/ExtUtils-MakeMaker/t/prereq.t			See if MakeMaker works
-ext/ExtUtils-MakeMaker/t/problems.t			How MakeMaker reacts to build problems
-ext/ExtUtils-MakeMaker/t/prompt.t			See if E::MM::prompt() works
-ext/ExtUtils-MakeMaker/t/recurs.t			See if recursive builds work
-ext/ExtUtils-MakeMaker/t/revision.t			See if $Revision is correct
-ext/ExtUtils-MakeMaker/t/split_command.t		See if MM's xargs-like function works
-ext/ExtUtils-MakeMaker/t/test_boilerplate.t		MakeMaker test
-ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm	test data for MakeMaker
-ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm	test data for MakeMaker
-ext/ExtUtils-MakeMaker/t/testlib.t			See if ExtUtils::testlib works
-ext/ExtUtils-MakeMaker/t/VERSION_FROM.t			See if MakeMaker's VERSION_FROM works
-ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t		See if WriteEmptyMakefile works
-ext/ExtUtils-MakeMaker/t/writemakefile_args.t		See if WriteMakefile works
-ext/ExtUtils-MakeMaker/t/xs.t				Part of MakeMaker's test suite
-ext/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm		Utilities to write MANIFEST files
-ext/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP	The default MANIFEST.SKIP
-ext/ExtUtils-Manifest/t/Manifest.t			See if ExtUtils::Manifest works
+ext/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm			Utilities to write MANIFEST files
+ext/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP		The default MANIFEST.SKIP
+ext/ExtUtils-Manifest/t/Manifest.t				See if ExtUtils::Manifest works
 ext/Fcntl/Fcntl.pm	Fcntl extension Perl module
 ext/Fcntl/Fcntl.xs	Fcntl extension external subroutines
 ext/Fcntl/Makefile.PL	Fcntl extension makefile writer
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index be87c698cd..da8395e282 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -609,7 +609,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'mschwern',
 	'DISTRIBUTION'	=> 'MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz',
-	'FILES'		=> q[ext/ExtUtils-MakeMaker],
+	'FILES'		=> q[cpan/ExtUtils-MakeMaker],
 	'EXCLUDED'	=> [ qr{^t/lib/Test/},
 			     qr{^inc/ExtUtils/},
 			   ],
diff --git a/ext/ExtUtils-MakeMaker/Changes b/cpan/ExtUtils-MakeMaker/Changes
index 2943c53417..2943c53417 100644
--- a/ext/ExtUtils-MakeMaker/Changes
+++ b/cpan/ExtUtils-MakeMaker/Changes
diff --git a/ext/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST
index 4f19e4ab57..4f19e4ab57 100644
--- a/ext/ExtUtils-MakeMaker/MANIFEST
+++ b/cpan/ExtUtils-MakeMaker/MANIFEST
diff --git a/ext/ExtUtils-MakeMaker/NOTES b/cpan/ExtUtils-MakeMaker/NOTES
index cb29aecdbc..cb29aecdbc 100644
--- a/ext/ExtUtils-MakeMaker/NOTES
+++ b/cpan/ExtUtils-MakeMaker/NOTES
diff --git a/ext/ExtUtils-MakeMaker/PATCHING b/cpan/ExtUtils-MakeMaker/PATCHING
index eed536a994..eed536a994 100644
--- a/ext/ExtUtils-MakeMaker/PATCHING
+++ b/cpan/ExtUtils-MakeMaker/PATCHING
diff --git a/ext/ExtUtils-MakeMaker/README b/cpan/ExtUtils-MakeMaker/README
index 9586c0ba17..9586c0ba17 100644
--- a/ext/ExtUtils-MakeMaker/README
+++ b/cpan/ExtUtils-MakeMaker/README
diff --git a/ext/ExtUtils-MakeMaker/TODO b/cpan/ExtUtils-MakeMaker/TODO
index e5cd355e57..e5cd355e57 100644
--- a/ext/ExtUtils-MakeMaker/TODO
+++ b/cpan/ExtUtils-MakeMaker/TODO
diff --git a/ext/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
index 5874aa61c7..5874aa61c7 100644
--- a/ext/ExtUtils-MakeMaker/bin/instmodsh
+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
index d4a0ef7d06..d4a0ef7d06 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
index fb9977b761..fb9977b761 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
index 380d4f8a9a..380d4f8a9a 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
index 4694f3f1c8..4694f3f1c8 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
index 0f27d177c9..0f27d177c9 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index a7afe2069c..a7afe2069c 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
index 168d23dfd7..168d23dfd7 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
index 9cc7522ac3..9cc7522ac3 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
index 84bedeada8..84bedeada8 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
index d26c0a10f2..d26c0a10f2 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
index bab7ab92bb..bab7ab92bb 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
index 950f1759dd..950f1759dd 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
index 73c1819f07..73c1819f07 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
index df6e5719ad..df6e5719ad 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
index d3f2949e7d..d3f2949e7d 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index dc09eca68b..dc09eca68b 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
index 492a12071a..492a12071a 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
index 3a7ec87ec8..3a7ec87ec8 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
index d3a5a4d507..d3a5a4d507 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
index 0c04f83006..0c04f83006 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
index c1a8c94a69..c1a8c94a69 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index 893c0bfb81..893c0bfb81 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
index 9c99f7d1b2..9c99f7d1b2 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
index d33f82e53b..d33f82e53b 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
index 8ad72649b1..8ad72649b1 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
index f1b47f6750..f1b47f6750 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
index 9b133f74a7..9b133f74a7 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
diff --git a/ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
index b1231e2c4c..b1231e2c4c 100644
--- a/ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
diff --git a/ext/ExtUtils-MakeMaker/t/00compile.t b/cpan/ExtUtils-MakeMaker/t/00compile.t
index 743bd9980a..743bd9980a 100644
--- a/ext/ExtUtils-MakeMaker/t/00compile.t
+++ b/cpan/ExtUtils-MakeMaker/t/00compile.t
diff --git a/ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t b/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t
index 6de5a73e94..6de5a73e94 100644
--- a/ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t
+++ b/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t
diff --git a/ext/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
index 8a140eb0b4..8a140eb0b4 100644
--- a/ext/ExtUtils-MakeMaker/t/INST.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
diff --git a/ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
index d2f605e468..d2f605e468 100644
--- a/ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t
+++ b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
diff --git a/ext/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
index 8bb9db8a1d..8bb9db8a1d 100644
--- a/ext/ExtUtils-MakeMaker/t/INST_PREFIX.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
diff --git a/ext/ExtUtils-MakeMaker/t/Liblist.t b/cpan/ExtUtils-MakeMaker/t/Liblist.t
index f8d3023a1d..f8d3023a1d 100644
--- a/ext/ExtUtils-MakeMaker/t/Liblist.t
+++ b/cpan/ExtUtils-MakeMaker/t/Liblist.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_Any.t b/cpan/ExtUtils-MakeMaker/t/MM_Any.t
index 672ff4dbd1..672ff4dbd1 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_Any.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_Any.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_BeOS.t b/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t
index be19058f65..be19058f65 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_BeOS.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_Cygwin.t b/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t
index 9640ac7fa8..9640ac7fa8 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_Cygwin.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_NW5.t b/cpan/ExtUtils-MakeMaker/t/MM_NW5.t
index 3f6198f1a4..3f6198f1a4 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_NW5.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_NW5.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_OS2.t b/cpan/ExtUtils-MakeMaker/t/MM_OS2.t
index 4d88e85f28..4d88e85f28 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_OS2.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_OS2.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_Unix.t b/cpan/ExtUtils-MakeMaker/t/MM_Unix.t
index 55c29e32d8..55c29e32d8 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_Unix.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_Unix.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_VMS.t b/cpan/ExtUtils-MakeMaker/t/MM_VMS.t
index 39a5aadd48..39a5aadd48 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_VMS.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_VMS.t
diff --git a/ext/ExtUtils-MakeMaker/t/MM_Win32.t b/cpan/ExtUtils-MakeMaker/t/MM_Win32.t
index 39475ae3b4..39475ae3b4 100644
--- a/ext/ExtUtils-MakeMaker/t/MM_Win32.t
+++ b/cpan/ExtUtils-MakeMaker/t/MM_Win32.t
diff --git a/ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t b/cpan/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t
index dd113a9a14..dd113a9a14 100644
--- a/ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t
+++ b/cpan/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t
diff --git a/ext/ExtUtils-MakeMaker/t/Mkbootstrap.t b/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t
index 17a3e4550a..17a3e4550a 100644
--- a/ext/ExtUtils-MakeMaker/t/Mkbootstrap.t
+++ b/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t
diff --git a/ext/ExtUtils-MakeMaker/t/PL_FILES.t b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t
index 2d22790692..2d22790692 100644
--- a/ext/ExtUtils-MakeMaker/t/PL_FILES.t
+++ b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t
diff --git a/ext/ExtUtils-MakeMaker/t/VERSION_FROM.t b/cpan/ExtUtils-MakeMaker/t/VERSION_FROM.t
index 56942c8a75..56942c8a75 100644
--- a/ext/ExtUtils-MakeMaker/t/VERSION_FROM.t
+++ b/cpan/ExtUtils-MakeMaker/t/VERSION_FROM.t
diff --git a/ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t b/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t
index 88496756c2..88496756c2 100644
--- a/ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t
+++ b/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t
diff --git a/ext/ExtUtils-MakeMaker/t/arch_check.t b/cpan/ExtUtils-MakeMaker/t/arch_check.t
index e4b3aef7af..e4b3aef7af 100644
--- a/ext/ExtUtils-MakeMaker/t/arch_check.t
+++ b/cpan/ExtUtils-MakeMaker/t/arch_check.t
diff --git a/ext/ExtUtils-MakeMaker/t/backwards.t b/cpan/ExtUtils-MakeMaker/t/backwards.t
index a9ecb82e35..a9ecb82e35 100644
--- a/ext/ExtUtils-MakeMaker/t/backwards.t
+++ b/cpan/ExtUtils-MakeMaker/t/backwards.t
diff --git a/ext/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t
index 0a51e4956f..0a51e4956f 100644
--- a/ext/ExtUtils-MakeMaker/t/basic.t
+++ b/cpan/ExtUtils-MakeMaker/t/basic.t
diff --git a/ext/ExtUtils-MakeMaker/t/build_man.t b/cpan/ExtUtils-MakeMaker/t/build_man.t
index d4649e7598..d4649e7598 100644
--- a/ext/ExtUtils-MakeMaker/t/build_man.t
+++ b/cpan/ExtUtils-MakeMaker/t/build_man.t
diff --git a/ext/ExtUtils-MakeMaker/t/cd.t b/cpan/ExtUtils-MakeMaker/t/cd.t
index 2563bf01d5..2563bf01d5 100644
--- a/ext/ExtUtils-MakeMaker/t/cd.t
+++ b/cpan/ExtUtils-MakeMaker/t/cd.t
diff --git a/ext/ExtUtils-MakeMaker/t/config.t b/cpan/ExtUtils-MakeMaker/t/config.t
index aca3dc6ff5..aca3dc6ff5 100644
--- a/ext/ExtUtils-MakeMaker/t/config.t
+++ b/cpan/ExtUtils-MakeMaker/t/config.t
diff --git a/ext/ExtUtils-MakeMaker/t/dir_target.t b/cpan/ExtUtils-MakeMaker/t/dir_target.t
index 0485469f20..0485469f20 100644
--- a/ext/ExtUtils-MakeMaker/t/dir_target.t
+++ b/cpan/ExtUtils-MakeMaker/t/dir_target.t
diff --git a/ext/ExtUtils-MakeMaker/t/fix_libs.t b/cpan/ExtUtils-MakeMaker/t/fix_libs.t
index 0ca8ffbb85..0ca8ffbb85 100644
--- a/ext/ExtUtils-MakeMaker/t/fix_libs.t
+++ b/cpan/ExtUtils-MakeMaker/t/fix_libs.t
diff --git a/ext/ExtUtils-MakeMaker/t/fixin.t b/cpan/ExtUtils-MakeMaker/t/fixin.t
index de5866a5c3..de5866a5c3 100644
--- a/ext/ExtUtils-MakeMaker/t/fixin.t
+++ b/cpan/ExtUtils-MakeMaker/t/fixin.t
diff --git a/ext/ExtUtils-MakeMaker/t/hints.t b/cpan/ExtUtils-MakeMaker/t/hints.t
index ab9d9553f7..ab9d9553f7 100644
--- a/ext/ExtUtils-MakeMaker/t/hints.t
+++ b/cpan/ExtUtils-MakeMaker/t/hints.t
diff --git a/ext/ExtUtils-MakeMaker/t/installed_file.t b/cpan/ExtUtils-MakeMaker/t/installed_file.t
index 58516bc611..58516bc611 100644
--- a/ext/ExtUtils-MakeMaker/t/installed_file.t
+++ b/cpan/ExtUtils-MakeMaker/t/installed_file.t
diff --git a/ext/ExtUtils-MakeMaker/t/is_of_type.t b/cpan/ExtUtils-MakeMaker/t/is_of_type.t
index 07e300e553..07e300e553 100644
--- a/ext/ExtUtils-MakeMaker/t/is_of_type.t
+++ b/cpan/ExtUtils-MakeMaker/t/is_of_type.t
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm
index 45faf7e230..45faf7e230 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
index 9745656f63..9745656f63 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm
index f30d65f567..f30d65f567 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm
index 7446185444..7446185444 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm
index c6573a1aad..c6573a1aad 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm
index ad1be2f6d1..ad1be2f6d1 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm
index 195fd56feb..195fd56feb 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm
index b81791d95e..b81791d95e 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/TieIn.pm b/cpan/ExtUtils-MakeMaker/t/lib/TieIn.pm
index a240867a6a..a240867a6a 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/TieIn.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/TieIn.pm
diff --git a/ext/ExtUtils-MakeMaker/t/lib/TieOut.pm b/cpan/ExtUtils-MakeMaker/t/lib/TieOut.pm
index 0a0f5f9cfe..0a0f5f9cfe 100644
--- a/ext/ExtUtils-MakeMaker/t/lib/TieOut.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/TieOut.pm
diff --git a/ext/ExtUtils-MakeMaker/t/make.t b/cpan/ExtUtils-MakeMaker/t/make.t
index 622dbd515f..622dbd515f 100644
--- a/ext/ExtUtils-MakeMaker/t/make.t
+++ b/cpan/ExtUtils-MakeMaker/t/make.t
diff --git a/ext/ExtUtils-MakeMaker/t/maketext_filter.t b/cpan/ExtUtils-MakeMaker/t/maketext_filter.t
index 404a91c94f..404a91c94f 100644
--- a/ext/ExtUtils-MakeMaker/t/maketext_filter.t
+++ b/cpan/ExtUtils-MakeMaker/t/maketext_filter.t
diff --git a/ext/ExtUtils-MakeMaker/t/metafile_data.t b/cpan/ExtUtils-MakeMaker/t/metafile_data.t
index 7e970ceb3d..7e970ceb3d 100644
--- a/ext/ExtUtils-MakeMaker/t/metafile_data.t
+++ b/cpan/ExtUtils-MakeMaker/t/metafile_data.t
diff --git a/ext/ExtUtils-MakeMaker/t/metafile_file.t b/cpan/ExtUtils-MakeMaker/t/metafile_file.t
index ca8a412eba..ca8a412eba 100644
--- a/ext/ExtUtils-MakeMaker/t/metafile_file.t
+++ b/cpan/ExtUtils-MakeMaker/t/metafile_file.t
diff --git a/ext/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
index b0eb50631a..b0eb50631a 100644
--- a/ext/ExtUtils-MakeMaker/t/min_perl_version.t
+++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
diff --git a/ext/ExtUtils-MakeMaker/t/miniperl.t b/cpan/ExtUtils-MakeMaker/t/miniperl.t
index 2334eb05d8..2334eb05d8 100644
--- a/ext/ExtUtils-MakeMaker/t/miniperl.t
+++ b/cpan/ExtUtils-MakeMaker/t/miniperl.t
diff --git a/ext/ExtUtils-MakeMaker/t/oneliner.t b/cpan/ExtUtils-MakeMaker/t/oneliner.t
index b040872011..b040872011 100644
--- a/ext/ExtUtils-MakeMaker/t/oneliner.t
+++ b/cpan/ExtUtils-MakeMaker/t/oneliner.t
diff --git a/ext/ExtUtils-MakeMaker/t/parse_version.t b/cpan/ExtUtils-MakeMaker/t/parse_version.t
index ca1048cb4b..ca1048cb4b 100644
--- a/ext/ExtUtils-MakeMaker/t/parse_version.t
+++ b/cpan/ExtUtils-MakeMaker/t/parse_version.t
diff --git a/ext/ExtUtils-MakeMaker/t/pm.t b/cpan/ExtUtils-MakeMaker/t/pm.t
index 42f028fe5d..42f028fe5d 100644
--- a/ext/ExtUtils-MakeMaker/t/pm.t
+++ b/cpan/ExtUtils-MakeMaker/t/pm.t
diff --git a/ext/ExtUtils-MakeMaker/t/pm_to_blib.t b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
index 66ef879e4e..66ef879e4e 100644
--- a/ext/ExtUtils-MakeMaker/t/pm_to_blib.t
+++ b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
diff --git a/ext/ExtUtils-MakeMaker/t/pod2man.t b/cpan/ExtUtils-MakeMaker/t/pod2man.t
index 1632234b15..1632234b15 100644
--- a/ext/ExtUtils-MakeMaker/t/pod2man.t
+++ b/cpan/ExtUtils-MakeMaker/t/pod2man.t
diff --git a/ext/ExtUtils-MakeMaker/t/postamble.t b/cpan/ExtUtils-MakeMaker/t/postamble.t
index c83a1c8910..c83a1c8910 100644
--- a/ext/ExtUtils-MakeMaker/t/postamble.t
+++ b/cpan/ExtUtils-MakeMaker/t/postamble.t
diff --git a/ext/ExtUtils-MakeMaker/t/prefixify.t b/cpan/ExtUtils-MakeMaker/t/prefixify.t
index b9e253a5f4..b9e253a5f4 100644
--- a/ext/ExtUtils-MakeMaker/t/prefixify.t
+++ b/cpan/ExtUtils-MakeMaker/t/prefixify.t
diff --git a/ext/ExtUtils-MakeMaker/t/prereq.t b/cpan/ExtUtils-MakeMaker/t/prereq.t
index cd5d18d781..cd5d18d781 100644
--- a/ext/ExtUtils-MakeMaker/t/prereq.t
+++ b/cpan/ExtUtils-MakeMaker/t/prereq.t
diff --git a/ext/ExtUtils-MakeMaker/t/prereq_print.t b/cpan/ExtUtils-MakeMaker/t/prereq_print.t
index e93a2fd8b9..e93a2fd8b9 100644
--- a/ext/ExtUtils-MakeMaker/t/prereq_print.t
+++ b/cpan/ExtUtils-MakeMaker/t/prereq_print.t
diff --git a/ext/ExtUtils-MakeMaker/t/problems.t b/cpan/ExtUtils-MakeMaker/t/problems.t
index 8956539de5..8956539de5 100644
--- a/ext/ExtUtils-MakeMaker/t/problems.t
+++ b/cpan/ExtUtils-MakeMaker/t/problems.t
diff --git a/ext/ExtUtils-MakeMaker/t/prompt.t b/cpan/ExtUtils-MakeMaker/t/prompt.t
index d428aa835e..d428aa835e 100644
--- a/ext/ExtUtils-MakeMaker/t/prompt.t
+++ b/cpan/ExtUtils-MakeMaker/t/prompt.t
diff --git a/ext/ExtUtils-MakeMaker/t/recurs.t b/cpan/ExtUtils-MakeMaker/t/recurs.t
index 746a09a219..746a09a219 100644
--- a/ext/ExtUtils-MakeMaker/t/recurs.t
+++ b/cpan/ExtUtils-MakeMaker/t/recurs.t
diff --git a/ext/ExtUtils-MakeMaker/t/revision.t b/cpan/ExtUtils-MakeMaker/t/revision.t
index ebfea1a296..ebfea1a296 100644
--- a/ext/ExtUtils-MakeMaker/t/revision.t
+++ b/cpan/ExtUtils-MakeMaker/t/revision.t
diff --git a/ext/ExtUtils-MakeMaker/t/split_command.t b/cpan/ExtUtils-MakeMaker/t/split_command.t
index e57a542700..e57a542700 100644
--- a/ext/ExtUtils-MakeMaker/t/split_command.t
+++ b/cpan/ExtUtils-MakeMaker/t/split_command.t
diff --git a/ext/ExtUtils-MakeMaker/t/test_boilerplate.t b/cpan/ExtUtils-MakeMaker/t/test_boilerplate.t
index f48324f2ba..f48324f2ba 100644
--- a/ext/ExtUtils-MakeMaker/t/test_boilerplate.t
+++ b/cpan/ExtUtils-MakeMaker/t/test_boilerplate.t
diff --git a/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm b/cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm
index e69de29bb2..e69de29bb2 100644
--- a/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm
+++ b/cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm
diff --git a/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm b/cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm
index e69de29bb2..e69de29bb2 100644
--- a/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm
+++ b/cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm
diff --git a/ext/ExtUtils-MakeMaker/t/testlib.t b/cpan/ExtUtils-MakeMaker/t/testlib.t
index b2c8ddbadf..b2c8ddbadf 100644
--- a/ext/ExtUtils-MakeMaker/t/testlib.t
+++ b/cpan/ExtUtils-MakeMaker/t/testlib.t
diff --git a/ext/ExtUtils-MakeMaker/t/writemakefile_args.t b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t
index 10913b9f37..10913b9f37 100644
--- a/ext/ExtUtils-MakeMaker/t/writemakefile_args.t
+++ b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t
diff --git a/ext/ExtUtils-MakeMaker/t/xs.t b/cpan/ExtUtils-MakeMaker/t/xs.t
index efd682edfd..efd682edfd 100644
--- a/ext/ExtUtils-MakeMaker/t/xs.t
+++ b/cpan/ExtUtils-MakeMaker/t/xs.t
diff --git a/make_ext.pl b/make_ext.pl
index 95d81f2ffc..c831c6fc25 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -32,7 +32,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
 		   cpan/Cwd cpan/Cwd/lib
 		   ext/ExtUtils-Command/lib
 		   dist/ExtUtils-Install/lib
-		   ext/ExtUtils-MakeMaker/lib
+		   cpan/ExtUtils-MakeMaker/lib
 		   ext/ExtUtils-Manifest/lib
 		   cpan/File-Path/lib
 		   );
@@ -305,6 +305,7 @@ sub build_extension {
     }
     $ENV{PERL5LIB} = join $Config{path_sep}, @new_inc;
     $ENV{PERL_CORE} = 1;
+    warn $ENV{PERL5LIB};
 
     my $makefile;
     if ($is_VMS) {
diff --git a/mkppport b/mkppport
index 09dcf8950b..6d65992930 100644
--- a/mkppport
+++ b/mkppport
@@ -12,7 +12,7 @@ sub iterdirs(&);
 
 my $rootdir = dirname($0);
 
-unshift @INC, File::Spec->catdir($rootdir, qw(ext ExtUtils-MakeMaker t lib));
+unshift @INC, File::Spec->catdir($rootdir, qw(cpan ExtUtils-MakeMaker t lib));
 
 eval q{ use MakeMaker::Test::Utils qw( which_perl ) };
 $@ and die $@;
diff --git a/utils/instmodsh.PL b/utils/instmodsh.PL
index 7043f1b9b9..08a47b7de8 100644
--- a/utils/instmodsh.PL
+++ b/utils/instmodsh.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $instmodsh
     = File::Spec->catfile(File::Spec->catdir(File::Spec->updir,
-					     qw(ext ExtUtils-MakeMaker bin)),
+					     qw(cpan ExtUtils-MakeMaker bin)),
 			  'instmodsh');
 
 if (open(INSTMODSH, $instmodsh)) {