Move Cwd from lib to ext.

Obviously, it's going to take a bit more work to piece the PathTools
distribution back together.

3 files changed, 24 insertions, 18 deletions

diff --git a/win32/Makefile b/win32/Makefile
index b7efd2e134..1b1f19b09a 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -831,6 +831,8 @@ CFG_VARS	=					\
 		"LINK_FLAGS=$(LINK_FLAGS:"=\")"		\
 		"optimize=$(OPTIMIZE:"=\")"
 
+ICWD = -I..\ext\Cwd
+
 #
 # Top targets
 #
@@ -987,7 +989,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
 ..\x2p\walk$(o) : ..\x2p\walk.c
 	$(CC) -I..\x2p  $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c
 
-$(X2P) : $(MINIPERL) $(X2P_OBJ)
+$(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
 	$(MINIPERL) ..\x2p\find2perl.PL
 	$(MINIPERL) ..\x2p\s2p.PL
 	$(LINK32) -subsystem:console -out:$@ @<<
@@ -1049,7 +1051,7 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
 MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs
-	$(MINIPERL) -I..\lib ..\mkppport
+	$(MINIPERL) -I..\lib $(ICWD) ..\mkppport
 
 MakePPPort_clean:
 	-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
@@ -1136,11 +1138,11 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib
-	$(PERLEXE) lib_pm.PL
+	$(PERLEXE) $(ICWD) lib_pm.PL
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
-	$(PERLEXE) ..\autodoc.pl ..
-	$(PERLEXE) ..\pod\perlmodlib.pl -q
+	$(PERLEXE) $(ICWD) ..\autodoc.pl ..
+	$(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q
 
 ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs
 	$(PERLEXE) ..\pod\buildtoc --build-toc -q
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6c5b4db009..c4391325e4 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1021,6 +1021,8 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll
 ODBCCP32_DLL = $(windir)\system\odbccp32.dll
 .ENDIF
 
+ICWD = -I..\ext\Cwd
+
 #
 # Top targets
 #
@@ -1284,7 +1286,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
 ..\x2p\walk$(o) : ..\x2p\walk.c
 	$(CC) -I..\x2p  $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c
 
-$(X2P) : $(MINIPERL) $(X2P_OBJ)
+$(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
 	$(MINIPERL) ..\x2p\find2perl.PL
 	$(MINIPERL) ..\x2p\s2p.PL
 .IF "$(CCTYPE)" == "BORLAND"
@@ -1378,10 +1380,10 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
 MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs
-	$(MINIPERL) -I..\lib ..\mkppport
+	$(MINIPERL) -I..\lib $(ICWD) ..\mkppport
 
 MakePPPort_clean:
-	-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
+	-if exist $(MINIPERL) $(MINIPERL) -I..\lib $(ICWD) ..\mkppport --clean
 
 #-------------------------------------------------------------------------------
 # The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for
@@ -1462,10 +1464,10 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\README.win32    ..\pod\perlwin32.pod
 	copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod
 	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
-	cd ..\lib && $(PERLEXE) lib_pm.PL
+	cd ..\lib && $(PERLEXE) $(ICWD) lib_pm.PL
 	$(PERLEXE) $(PL2BAT) $(UTILS)
-	$(PERLEXE) ..\autodoc.pl ..
-	$(PERLEXE) ..\pod\perlmodlib.pl -q
+	$(PERLEXE) $(ICWD) ..\autodoc.pl ..
+	$(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q
 
 ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs
 	$(PERLEXE) ..\pod\buildtoc --build-toc -q
diff --git a/win32/pod.mak b/win32/pod.mak
index 9489c22124..593c701aab 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -14,6 +14,8 @@ converters: $(CONVERTERS)
 PERL = ..\miniperl.exe
 REALPERL = ..\perl.exe
 
+ICWD = -I..\ext\Cwd
+
 POD = \
 	perl.pod	\
 	perl5004delta.pod	\
@@ -571,22 +573,22 @@ check:	podchecker
 
 # Dependencies.
 pod2latex:	pod2latex.PL ../lib/Config.pm
-	$(PERL) -I../lib pod2latex.PL
+	$(PERL) -I../lib $(ICWD) pod2latex.PL
 
 pod2html:	pod2html.PL ../lib/Config.pm
-	$(PERL) -I ../lib pod2html.PL
+	$(PERL) -I ../lib $(ICWD) pod2html.PL
 
 pod2man:	pod2man.PL ../lib/Config.pm
-	$(PERL) -I ../lib pod2man.PL
+	$(PERL) -I ../lib $(ICWD) pod2man.PL
 
 pod2text:	pod2text.PL ../lib/Config.pm
-	$(PERL) -I ../lib pod2text.PL
+	$(PERL) -I ../lib $(ICWD) pod2text.PL
 
 pod2usage:	pod2usage.PL ../lib/Config.pm
-	$(PERL) -I ../lib pod2usage.PL
+	$(PERL) -I ../lib $(ICWD) pod2usage.PL
 
 podchecker:	podchecker.PL ../lib/Config.pm
-	$(PERL) -I ../lib podchecker.PL
+	$(PERL) -I ../lib $(ICWD) podchecker.PL
 
 podselect:	podselect.PL ../lib/Config.pm
-	$(PERL) -I ../lib podselect.PL
+	$(PERL) -I ../lib $(ICWD) podselect.PL