33 files changed, 37 insertions, 36 deletions
diff --git a/MANIFEST b/MANIFEST
index c6ca513a60..1112c278db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -273,6 +273,27 @@ cpan/CPAN/t/02nox.t		See if CPAN::Nox works
 cpan/CPAN/t/03pkgs.t		See if CPAN::Version works
 cpan/CPAN/t/10version.t		See if CPAN the module works
 cpan/CPAN/t/11mirroredby.t		See if CPAN::Mirrored::By works
+cpan/Cwd/Changes			Cwd extension Changelog
+cpan/Cwd/Cwd.pm				Various cwd routines (getcwd, fastcwd, chdir)
+cpan/Cwd/Cwd.xs				Cwd extension external subroutines
+cpan/Cwd/lib/File/Spec/Cygwin.pm	portable operations on Cygwin file names
+cpan/Cwd/lib/File/Spec/Epoc.pm		portable operations on EPOC file names
+cpan/Cwd/lib/File/Spec/Functions.pm	Function interface to File::Spec object methods
+cpan/Cwd/lib/File/Spec/Mac.pm		portable operations on Mac file names
+cpan/Cwd/lib/File/Spec/OS2.pm		portable operations on OS2 file names
+cpan/Cwd/lib/File/Spec.pm		portable operations on file names
+cpan/Cwd/lib/File/Spec/Unix.pm		portable operations on Unix file names
+cpan/Cwd/lib/File/Spec/VMS.pm		portable operations on VMS file names
+cpan/Cwd/lib/File/Spec/Win32.pm		portable operations on Win32 and NetWare file names
+cpan/Cwd/Makefile.PL			Cwd extension makefile maker
+cpan/Cwd/t/crossplatform.t		See if File::Spec works crossplatform
+cpan/Cwd/t/cwd.t			See if Cwd works
+cpan/Cwd/t/Functions.t			See if File::Spec::Functions works
+cpan/Cwd/t/rel2abs2rel.t		See if File::Spec->rel2abs/abs2rel works
+cpan/Cwd/t/Spec.t			See if File::Spec works
+cpan/Cwd/t/taint.t			See if Cwd works with taint
+cpan/Cwd/t/tmpdir.t			See if File::Spec->tmpdir() works
+cpan/Cwd/t/win32.t			See if Cwd works on Win32
 cpan/DB_File/Changes		Berkeley DB extension change log
 cpan/DB_File/config.in		Part of Berkeley DB configuration
 cpan/DB_File/DB_File_BS		Berkeley DB extension mkbootstrap fodder
@@ -1238,27 +1259,6 @@ ext/Compress-Raw-Zlib/zlib-src/zutil.h	Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/Zlib.xs		Compress::Raw::Zlib
 ext/constant/lib/constant.pm	For "use constant"
 ext/constant/t/constant.t	See if compile-time constants work
-ext/Cwd/Changes				Cwd extension Changelog
-ext/Cwd/Cwd.pm				Various cwd routines (getcwd, fastcwd, chdir)
-ext/Cwd/Cwd.xs				Cwd extension external subroutines
-ext/Cwd/lib/File/Spec/Cygwin.pm		portable operations on Cygwin file names
-ext/Cwd/lib/File/Spec/Epoc.pm		portable operations on EPOC file names
-ext/Cwd/lib/File/Spec/Functions.pm	Function interface to File::Spec object methods
-ext/Cwd/lib/File/Spec/Mac.pm		portable operations on Mac file names
-ext/Cwd/lib/File/Spec/OS2.pm		portable operations on OS2 file names
-ext/Cwd/lib/File/Spec.pm		portable operations on file names
-ext/Cwd/lib/File/Spec/Unix.pm		portable operations on Unix file names
-ext/Cwd/lib/File/Spec/VMS.pm		portable operations on VMS file names
-ext/Cwd/lib/File/Spec/Win32.pm		portable operations on Win32 and NetWare file names
-ext/Cwd/Makefile.PL			Cwd extension makefile maker
-ext/Cwd/t/crossplatform.t		See if File::Spec works crossplatform
-ext/Cwd/t/cwd.t				See if Cwd works
-ext/Cwd/t/Functions.t			See if File::Spec::Functions works
-ext/Cwd/t/rel2abs2rel.t			See if File::Spec->rel2abs/abs2rel works
-ext/Cwd/t/Spec.t			See if File::Spec works
-ext/Cwd/t/taint.t			See if Cwd works with taint
-ext/Cwd/t/tmpdir.t			See if File::Spec->tmpdir() works
-ext/Cwd/t/win32.t			See if Cwd works on Win32
 ext/Data-Dumper/Changes		Data pretty printer, changelog
 ext/Data-Dumper/Dumper.pm	Data pretty printer, module
 ext/Data-Dumper/Dumper.xs	Data pretty printer, externals
diff --git a/Makefile.SH b/Makefile.SH
index df877487ff..7e6a099844 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -477,7 +477,7 @@ obj = $(ndt_obj) $(DTRACE_O)
 perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod
 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
-Icwd = -Iext/Cwd -Iext/Cwd/lib
+Icwd = -Icpan/Cwd -Icpan/Cwd/lib
 
 lintflags = \
     -b \
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 6f7bf21dfe..db85062564 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1118,7 +1118,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'SMUELLER/PathTools-3.30_01.tar.gz',
-	'FILES'		=> q[ext/Cwd],
+	'FILES'		=> q[cpan/Cwd],
 	# XXX note that the CPAN and blead Makefile.PL are totally
 	# unrelated. The blead one is described as 'core-only'.
 	# Perhaps after the big lib/ => ext/ migration it will be possible
diff --git a/README.cygwin b/README.cygwin
index e75d3643d0..3933e562a4 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -566,7 +566,7 @@ be kept as clean as possible.
   pod/perltoc.pod pod.lst Porting/Glossary pod/perlrepository.pod
   Porting/checkAUTHORS.pl
   ext/Compress-Raw-Zlib/Changes ext/Compress-Raw-Zlib/README
-  ext/Compress-Zlib/Changes ext/Cwd/Changes ext/DB_File/Changes
+  ext/Compress-Zlib/Changes cpan/Cwd/Changes ext/DB_File/Changes
   ext/Encode/Changes ext/Sys-Syslog/Changes ext/Time-HiRes/Changes
   ext/Win32API-File/Changes lib/CGI/Changes lib/ExtUtils/CBuilder/Changes
   lib/ExtUtils/Changes lib/ExtUtils/NOTES lib/ExtUtils/PATCHING
@@ -715,7 +715,7 @@ be kept as clean as possible.
 =item Perl Module Tests
 
   ext/Compress-Zlib/t/14gzopen.t
-  ext/Cwd/t/cwd.t
+  cpan/Cwd/t/cwd.t
   ext/DB_File/t/db-btree.t
   ext/DB_File/t/db-hash.t
   ext/DB_File/t/db-recno.t
diff --git a/README.qnx b/README.qnx
index 5951810ab4..0ad269a272 100644
--- a/README.qnx
+++ b/README.qnx
@@ -86,7 +86,7 @@ they both point to the correct library, that is,
 
 The following tests may report errors under QNX4:
 
-ext/Cwd/Cwd.t will complain if `pwd` and cwd don't give
+cpan/Cwd/Cwd.t will complain if `pwd` and cwd don't give
 the same results. cwd calls `fullpath -t`, so if you
 cd `fullpath -t` before running the test, it will
 pass.
diff --git a/ext/Cwd/Changes b/cpan/Cwd/Changes
index 29d0113fcb..29d0113fcb 100644
--- a/ext/Cwd/Changes
+++ b/cpan/Cwd/Changes
diff --git a/ext/Cwd/Cwd.pm b/cpan/Cwd/Cwd.pm
index 3a0fda3406..3a0fda3406 100644
--- a/ext/Cwd/Cwd.pm
+++ b/cpan/Cwd/Cwd.pm
diff --git a/ext/Cwd/Cwd.xs b/cpan/Cwd/Cwd.xs
index 949b94ccbf..949b94ccbf 100644
--- a/ext/Cwd/Cwd.xs
+++ b/cpan/Cwd/Cwd.xs
diff --git a/ext/Cwd/Makefile.PL b/cpan/Cwd/Makefile.PL
index 8d6c18753c..8d6c18753c 100644
--- a/ext/Cwd/Makefile.PL
+++ b/cpan/Cwd/Makefile.PL
diff --git a/ext/Cwd/lib/File/Spec.pm b/cpan/Cwd/lib/File/Spec.pm
index 839e2aada2..839e2aada2 100644
--- a/ext/Cwd/lib/File/Spec.pm
+++ b/cpan/Cwd/lib/File/Spec.pm
diff --git a/ext/Cwd/lib/File/Spec/Cygwin.pm b/cpan/Cwd/lib/File/Spec/Cygwin.pm
index 050a1bb2b7..050a1bb2b7 100644
--- a/ext/Cwd/lib/File/Spec/Cygwin.pm
+++ b/cpan/Cwd/lib/File/Spec/Cygwin.pm
diff --git a/ext/Cwd/lib/File/Spec/Epoc.pm b/cpan/Cwd/lib/File/Spec/Epoc.pm
index 54ff667c52..54ff667c52 100644
--- a/ext/Cwd/lib/File/Spec/Epoc.pm
+++ b/cpan/Cwd/lib/File/Spec/Epoc.pm
diff --git a/ext/Cwd/lib/File/Spec/Functions.pm b/cpan/Cwd/lib/File/Spec/Functions.pm
index e7becc7cfa..e7becc7cfa 100644
--- a/ext/Cwd/lib/File/Spec/Functions.pm
+++ b/cpan/Cwd/lib/File/Spec/Functions.pm
diff --git a/ext/Cwd/lib/File/Spec/Mac.pm b/cpan/Cwd/lib/File/Spec/Mac.pm
index 8b47470d6b..8b47470d6b 100644
--- a/ext/Cwd/lib/File/Spec/Mac.pm
+++ b/cpan/Cwd/lib/File/Spec/Mac.pm
diff --git a/ext/Cwd/lib/File/Spec/OS2.pm b/cpan/Cwd/lib/File/Spec/OS2.pm
index a8fa63e3c1..a8fa63e3c1 100644
--- a/ext/Cwd/lib/File/Spec/OS2.pm
+++ b/cpan/Cwd/lib/File/Spec/OS2.pm
diff --git a/ext/Cwd/lib/File/Spec/Unix.pm b/cpan/Cwd/lib/File/Spec/Unix.pm
index 8fd2320a39..8fd2320a39 100644
--- a/ext/Cwd/lib/File/Spec/Unix.pm
+++ b/cpan/Cwd/lib/File/Spec/Unix.pm
diff --git a/ext/Cwd/lib/File/Spec/VMS.pm b/cpan/Cwd/lib/File/Spec/VMS.pm
index 34b592abbf..34b592abbf 100644
--- a/ext/Cwd/lib/File/Spec/VMS.pm
+++ b/cpan/Cwd/lib/File/Spec/VMS.pm
diff --git a/ext/Cwd/lib/File/Spec/Win32.pm b/cpan/Cwd/lib/File/Spec/Win32.pm
index 93301ac735..93301ac735 100644
--- a/ext/Cwd/lib/File/Spec/Win32.pm
+++ b/cpan/Cwd/lib/File/Spec/Win32.pm
diff --git a/ext/Cwd/t/Functions.t b/cpan/Cwd/t/Functions.t
index 457f53cb6f..457f53cb6f 100644
--- a/ext/Cwd/t/Functions.t
+++ b/cpan/Cwd/t/Functions.t
diff --git a/ext/Cwd/t/Spec.t b/cpan/Cwd/t/Spec.t
index 0c629bfa79..0c629bfa79 100644
--- a/ext/Cwd/t/Spec.t
+++ b/cpan/Cwd/t/Spec.t
diff --git a/ext/Cwd/t/crossplatform.t b/cpan/Cwd/t/crossplatform.t
index b7c76fc1af..b7c76fc1af 100644
--- a/ext/Cwd/t/crossplatform.t
+++ b/cpan/Cwd/t/crossplatform.t
diff --git a/ext/Cwd/t/cwd.t b/cpan/Cwd/t/cwd.t
index bab3dc372b..bab3dc372b 100644
--- a/ext/Cwd/t/cwd.t
+++ b/cpan/Cwd/t/cwd.t
diff --git a/ext/Cwd/t/rel2abs2rel.t b/cpan/Cwd/t/rel2abs2rel.t
index 0959d574b9..0959d574b9 100644
--- a/ext/Cwd/t/rel2abs2rel.t
+++ b/cpan/Cwd/t/rel2abs2rel.t
diff --git a/ext/Cwd/t/taint.t b/cpan/Cwd/t/taint.t
index 60cbfebc41..60cbfebc41 100644
--- a/ext/Cwd/t/taint.t
+++ b/cpan/Cwd/t/taint.t
diff --git a/ext/Cwd/t/tmpdir.t b/cpan/Cwd/t/tmpdir.t
index 6adad18cb9..6adad18cb9 100644
--- a/ext/Cwd/t/tmpdir.t
+++ b/cpan/Cwd/t/tmpdir.t
diff --git a/ext/Cwd/t/win32.t b/cpan/Cwd/t/win32.t
index 3fa5cb86ab..3fa5cb86ab 100644
--- a/ext/Cwd/t/win32.t
+++ b/cpan/Cwd/t/win32.t
diff --git a/hints/qnx.sh b/hints/qnx.sh
index 473815cae5..f7f80538c1 100644
--- a/hints/qnx.sh
+++ b/hints/qnx.sh
@@ -55,7 +55,7 @@
 #   they both point to the correct library, that is,
 #   /usr/tcptk/current/usr/lib/socket3r.lib.
 # 
-#   ext/Cwd/Cwd.t will complain if `pwd` and cwd don't give
+#   cpan/Cwd/Cwd.t will complain if `pwd` and cwd don't give
 #   the same results. cwd calls `fullpath -t`, so if you
 #   cd `fullpath -t` before running the test, it will
 #   pass.
diff --git a/hints/uwin.sh b/hints/uwin.sh
index 5e50179e9f..b73b305d09 100644
--- a/hints/uwin.sh
+++ b/hints/uwin.sh
@@ -123,7 +123,7 @@ usevfork=false
 
 #          got: '/E/users/jpl/src/cmd/perl/t'
 #     expected: '/e/users/jpl/src/cmd/perl/t'
-#     Failed test (../ext/Cwd/t/cwd.t at line 88)
+#     Failed test (../cpan/Cwd/t/cwd.t at line 88)
 
 # when running tests under harness, try the simple expedient of
 # changing to directory
diff --git a/make_ext.pl b/make_ext.pl
index c6c6378087..6779b440fb 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Config;
 BEGIN {
-    unshift @INC, $^O eq 'MSWin32' ? '../ext/Cwd' : 'ext/Cwd';
+    unshift @INC, $^O eq 'MSWin32' ? '../cpan/Cwd' : 'cpan/Cwd';
 }
 use Cwd;
 
@@ -14,7 +14,8 @@ use Cwd;
 # After which, all nonxs modules are in lib, which was always sufficient to
 # allow miniperl to build everything else.
 
-my @toolchain = qw(ext/constant/lib ext/Cwd ext/Cwd/lib ext/ExtUtils-Command/lib
+my @toolchain = qw(ext/constant/lib cpan/Cwd cpan/Cwd/lib
+		   ext/ExtUtils-Command/lib
 		   ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
 		   ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib
 		   cpan/File-Path/lib cpan/AutoLoader/lib);
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index b4e14788ab..d231e3c35f 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -241,7 +241,7 @@ NOOP = continue
 # Macros to invoke a copy of miniperl during the build.  Targets which
 # are built using these macros should depend on $(MINIPERL_EXE)
 MINIPERL_EXE = Sys$Disk:[]miniperl$(E)
-MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" "-I[.ext.Cwd]" "-I[.ext.Cwd.lib]"
+MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" "-I[.cpan.Cwd]" "-I[.cpan.Cwd.lib]"
 MINIPERLQ = MCR $(MINIPERL_EXE) ""-I[.lib]""
 XSUBPP = $(MINIPERL) "-I[.ext.re]" [.lib.extutils]xsubpp -noprototypes
 # Macro to invoke a preexisting copy of Perl.  This is used to regenerate
diff --git a/win32/Makefile b/win32/Makefile
index cdcc653f0f..3459014586 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -825,7 +825,7 @@ CFG_VARS	=					\
 		"LINK_FLAGS=$(LINK_FLAGS:"=\")"		\
 		"optimize=$(OPTIMIZE:"=\")"
 
-ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib
+ICWD = -I..\cpan\Cwd -I..\cpan\Cwd\lib
 
 #
 # Top targets
@@ -1228,7 +1228,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
-	..\$(MINIPERL) -I.. -I..\..\ext\Cwd\lib mktables -check $@ $(FIRSTUNIFILE)
+	..\$(MINIPERL) -I.. -I..\..\cpan\Cwd\lib mktables -check $@ $(FIRSTUNIFILE)
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
 	$(XCOPY) $(MINIPERL) ..\t\$(NULL)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index d8c6459935..3dc0fe52a1 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1015,7 +1015,7 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll
 ODBCCP32_DLL = $(windir)\system\odbccp32.dll
 .ENDIF
 
-ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib
+ICWD = -I..\cpan\Cwd -I..\cpan\Cwd\lib
 
 #
 # Top targets
@@ -1561,7 +1561,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
-	..\$(MINIPERL) -I.. -I..\..\ext\Cwd\lib mktables
+	..\$(MINIPERL) -I.. -I..\..\cpan\Cwd\lib mktables
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
 	$(XCOPY) $(MINIPERL) ..\t\$(NULL)
diff --git a/win32/pod.mak b/win32/pod.mak
index 593c701aab..95916c1d37 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -14,7 +14,7 @@ converters: $(CONVERTERS)
 PERL = ..\miniperl.exe
 REALPERL = ..\perl.exe
 
-ICWD = -I..\ext\Cwd
+ICWD = -I..\cpan\Cwd
 
 POD = \
 	perl.pod	\