From f8d6280ff20162987d9905bbb380d50485ce4e99 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Tue, 24 Apr 2012 22:48:38 +0200 Subject: [PATCH] On Win32 run autodoc.pl and pod/perlmodlib.PL using miniperl, not perl. *nix and VMS both use miniperl to run these two build scripts. This makes Win32 consistent. This eliminates the last two uses of the ICWD macro, so eliminate it too. --- win32/Makefile | 6 ++---- win32/makefile.mk | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/win32/Makefile b/win32/Makefile index 8968a67..024a238 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -809,8 +809,6 @@ CFG_VARS = \ "optimize=$(OPTIMIZE:"=\")" \ "WIN64=$(WIN64)" -ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib - # # Top targets # @@ -1153,8 +1151,8 @@ utils: $(PERLEXE) $(X2P) ..\utils\Makefile copy ..\pod\perldelta.pod ..\pod\perl5192delta.pod cd ..\win32 $(PERLEXE) $(PL2BAT) $(UTILS) - $(PERLEXE) $(ICWD) ..\autodoc.pl .. - $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q + $(MINIPERL) -I..\lib ..\autodoc.pl .. + $(MINIPERL) -I..\lib ..\pod\perlmodlib.pl -q ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs $(PERLEXE) -f ..\pod\buildtoc -q diff --git a/win32/makefile.mk b/win32/makefile.mk index 376eb5a..4ed4a16 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -921,8 +921,6 @@ CFG_VARS = \ ARCHPREFIX=$(ARCHPREFIX) ~ \ WIN64=$(WIN64) -ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib - # # Top targets # @@ -1331,8 +1329,8 @@ utils: $(PERLEXE) $(X2P) ..\utils\Makefile copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perldelta.pod ..\pod\perl5192delta.pod $(PERLEXE) $(PL2BAT) $(UTILS) - $(PERLEXE) $(ICWD) ..\autodoc.pl .. - $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q + $(MINIPERL) -I..\lib ..\autodoc.pl .. + $(MINIPERL) -I..\lib ..\pod\perlmodlib.pl -q ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs $(PERLEXE) -f ..\pod\buildtoc -q -- 2.7.4