20 files changed, 19 insertions, 21 deletions
diff --git a/MANIFEST b/MANIFEST
index 035ed1088c..1d8411e485 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -947,6 +947,19 @@ cpan/ExtUtils-Constant/lib/ExtUtils/Constant/ProxySubs.pm	generate XS code for p
 cpan/ExtUtils-Constant/lib/ExtUtils/Constant/Utils.pm		generate XS code to import C header constants
 cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm		generate XS code to import C header constants
 cpan/ExtUtils-Constant/t/Constant.t				See if ExtUtils::Constant works
+cpan/ExtUtils-Install/Changes				ExtUtils-Install change log
+cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm		Information on installed extensions
+cpan/ExtUtils-Install/lib/ExtUtils/Install.pm		Handles 'make install' on extensions
+cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm		Manipulates .packlist files
+cpan/ExtUtils-Install/t/can_write_dir.t			Does the _can_write_dir function of ExtUtils::Install work properly?
+cpan/ExtUtils-Install/t/Installapi2.t			See if new api for ExtUtils::Install::install() works
+cpan/ExtUtils-Install/t/Installed.t			See if ExtUtils::Installed works
+cpan/ExtUtils-Install/t/Install.t			See if ExtUtils::Install works
+cpan/ExtUtils-Install/t/InstallWithMM.t			See if ExtUtils::Install works (related to EUMM/t/basic.t)
+cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm	MakeMaker test utilities
+cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm	MakeMaker test utilities
+cpan/ExtUtils-Install/t/lib/TieOut.pm			Testing library to capture prints
+cpan/ExtUtils-Install/t/Packlist.t			See if Packlist works
 cpan/ExtUtils-MakeMaker/bin/instmodsh				Give information about installed extensions
 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
@@ -2897,19 +2910,6 @@ dist/ExtUtils-CBuilder/t/01-basic.t				tests for ExtUtils::CBuilder
 dist/ExtUtils-CBuilder/t/02-link.t				tests for ExtUtils::CBuilder
 dist/ExtUtils-CBuilder/t/03-cplusplus.t				tests for ExtUtils::CBuilder
 dist/ExtUtils-CBuilder/t/04-base.t				tests for ExtUtils::CBuilder
-dist/ExtUtils-Install/Changes				ExtUtils-Install change log
-dist/ExtUtils-Install/lib/ExtUtils/Installed.pm		Information on installed extensions
-dist/ExtUtils-Install/lib/ExtUtils/Install.pm		Handles 'make install' on extensions
-dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm		Manipulates .packlist files
-dist/ExtUtils-Install/t/can_write_dir.t			Does the _can_write_dir function of ExtUtils::Install work properly?
-dist/ExtUtils-Install/t/Installapi2.t			See if new api for ExtUtils::Install::install() works
-dist/ExtUtils-Install/t/Installed.t			See if ExtUtils::Installed works
-dist/ExtUtils-Install/t/Install.t			See if ExtUtils::Install works
-dist/ExtUtils-Install/t/InstallWithMM.t			See if ExtUtils::Install works (related to EUMM/t/basic.t)
-dist/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm	MakeMaker test utilities
-dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm	MakeMaker test utilities
-dist/ExtUtils-Install/t/lib/TieOut.pm			Testing library to capture prints
-dist/ExtUtils-Install/t/Packlist.t			See if Packlist works
 dist/ExtUtils-ParseXS/Changes					ExtUtils::ParseXS change log
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm		ExtUtils::ParseXS guts
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm	ExtUtils::ParseXS guts
diff --git a/META.json b/META.json
index cc693df5ed..256c67d5fb 100644
--- a/META.json
+++ b/META.json
@@ -27,7 +27,6 @@
          "dist/Env",
          "dist/Exporter",
          "dist/ExtUtils-CBuilder",
-         "dist/ExtUtils-Install",
          "dist/ExtUtils-ParseXS",
          "dist/Filter-Simple",
          "dist/I18N-Collate",
diff --git a/META.yml b/META.yml
index a58992b364..d0a211eed7 100644
--- a/META.yml
+++ b/META.yml
@@ -25,7 +25,6 @@ no_index:
     - dist/Env
     - dist/Exporter
     - dist/ExtUtils-CBuilder
-    - dist/ExtUtils-Install
     - dist/ExtUtils-ParseXS
     - dist/Filter-Simple
     - dist/I18N-Collate
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 07b57c3449..bff9951946 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -458,7 +458,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::Install' => {
         'DISTRIBUTION' => 'BINGOS/ExtUtils-Install-1.68.tar.gz',
-        'FILES'        => q[dist/ExtUtils-Install],
+        'FILES'        => q[cpan/ExtUtils-Install],
         'EXCLUDED'     => [
             qw( t/lib/Test/Builder.pm
                 t/lib/Test/Builder/Module.pm
diff --git a/Porting/deparse-skips.txt b/Porting/deparse-skips.txt
index eee301145d..82071f2cdb 100644
--- a/Porting/deparse-skips.txt
+++ b/Porting/deparse-skips.txt
@@ -56,6 +56,9 @@ __DEPARSE_FAILURES__
 ../cpan/Encode/t/jis7-fallback.t
 ../cpan/Encode/t/jperl.t
 ../cpan/Encode/t/mime-header.t
+../cpan/ExtUtils-Install/t/Installapi2.t
+../cpan/ExtUtils-Install/t/Packlist.t
+../cpan/ExtUtils-Install/t/can_write_dir.t
 ../cpan/ExtUtils-MakeMaker/t/arch_check.t
 ../cpan/ExtUtils-MakeMaker/t/min_perl_version.t
 ../cpan/ExtUtils-MakeMaker/t/xs.t
@@ -272,9 +275,6 @@ __DEPARSE_FAILURES__
 ../dist/Data-Dumper/t/perl-74170.t
 ../dist/Data-Dumper/t/quotekeys.t
 ../dist/Exporter/t/Exporter.t
-../dist/ExtUtils-Install/t/Installapi2.t
-../dist/ExtUtils-Install/t/Packlist.t
-../dist/ExtUtils-Install/t/can_write_dir.t
 ../dist/Filter-Simple/t/data.t
 ../dist/I18N-LangTags/t/50_super.t
 ../dist/IO/t/io_file_export.t
diff --git a/dist/ExtUtils-Install/Changes b/cpan/ExtUtils-Install/Changes
index a828406b56..a828406b56 100644
--- a/dist/ExtUtils-Install/Changes
+++ b/cpan/ExtUtils-Install/Changes
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
index 85fe1c97f2..85fe1c97f2 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm
index a62de6e377..a62de6e377 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm
index 8323725c64..8323725c64 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm
diff --git a/dist/ExtUtils-Install/t/Install.t b/cpan/ExtUtils-Install/t/Install.t
index 440d23082d..440d23082d 100644
--- a/dist/ExtUtils-Install/t/Install.t
+++ b/cpan/ExtUtils-Install/t/Install.t
diff --git a/dist/ExtUtils-Install/t/InstallWithMM.t b/cpan/ExtUtils-Install/t/InstallWithMM.t
index 58ffd3eceb..58ffd3eceb 100644
--- a/dist/ExtUtils-Install/t/InstallWithMM.t
+++ b/cpan/ExtUtils-Install/t/InstallWithMM.t
diff --git a/dist/ExtUtils-Install/t/Installapi2.t b/cpan/ExtUtils-Install/t/Installapi2.t
index 4acfdc3559..4acfdc3559 100644
--- a/dist/ExtUtils-Install/t/Installapi2.t
+++ b/cpan/ExtUtils-Install/t/Installapi2.t
diff --git a/dist/ExtUtils-Install/t/Installed.t b/cpan/ExtUtils-Install/t/Installed.t
index 5c5c4d3d09..5c5c4d3d09 100644
--- a/dist/ExtUtils-Install/t/Installed.t
+++ b/cpan/ExtUtils-Install/t/Installed.t
diff --git a/dist/ExtUtils-Install/t/Packlist.t b/cpan/ExtUtils-Install/t/Packlist.t
index 3f6c05868c..3f6c05868c 100644
--- a/dist/ExtUtils-Install/t/Packlist.t
+++ b/cpan/ExtUtils-Install/t/Packlist.t
diff --git a/dist/ExtUtils-Install/t/can_write_dir.t b/cpan/ExtUtils-Install/t/can_write_dir.t
index be6fb1896d..be6fb1896d 100644
--- a/dist/ExtUtils-Install/t/can_write_dir.t
+++ b/cpan/ExtUtils-Install/t/can_write_dir.t
diff --git a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
index 868d0b9019..868d0b9019 100644
--- a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
+++ b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
diff --git a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
index 8d5ee1a030..8d5ee1a030 100644
--- a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
+++ b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
diff --git a/dist/ExtUtils-Install/t/lib/TieOut.pm b/cpan/ExtUtils-Install/t/lib/TieOut.pm
index 0a0f5f9cfe..0a0f5f9cfe 100644
--- a/dist/ExtUtils-Install/t/lib/TieOut.pm
+++ b/cpan/ExtUtils-Install/t/lib/TieOut.pm
diff --git a/t/TEST b/t/TEST
index 8164786b8d..5d25af682e 100755
--- a/t/TEST
+++ b/t/TEST
@@ -40,6 +40,7 @@ my %abs = (
 	   '../cpan/Encode' => 1,
 	   '../cpan/ExtUtils-Command' => 1,
 	   '../cpan/ExtUtils-Constant' => 1,
+	   '../cpan/ExtUtils-Install' => 1,
 	   '../cpan/ExtUtils-MakeMaker' => 1,
 	   '../cpan/ExtUtils-Manifest' => 1,
 	   '../cpan/File-Fetch' => 1,
@@ -53,7 +54,6 @@ my %abs = (
 	   '../cpan/Test-Simple' => 1,
 	   '../cpan/podlators' => 1,
 	   '../dist/Cwd' => 1,
-	   '../dist/ExtUtils-Install' => 1,
 	   '../dist/ExtUtils-ParseXS' => 1,
 	   '../dist/Tie-File' => 1,
 	  );
diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index bbf2f9ef8a..ccef6ea08b 100644
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -29,7 +29,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
 		   dist/Carp/lib
 		   dist/PathTools dist/PathTools/lib
 		   cpan/ExtUtils-Command/lib
-		   dist/ExtUtils-Install/lib
+		   cpan/ExtUtils-Install/lib
 		   cpan/ExtUtils-MakeMaker/lib
 		   cpan/ExtUtils-Manifest/lib
 		   cpan/File-Path/lib