From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 19 Sep 2009 13:51:35 +0000 (+0100)
Subject: win32/config_h.PL indirectly needs File::Spec, before XS extensions are built.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=38cd195c665c35bd946e2265512bec7d92019088;p=p5sagit%2Fp5-mst-13.2.git

win32/config_h.PL indirectly needs File::Spec, before XS extensions are built.
---

diff --git a/win32/Makefile b/win32/Makefile
index 77ac9b2..b1d1418 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -898,7 +898,7 @@ regen_config_h:
 	miniperl configpm
 	cd win32
 	-del /f $(CFGH_TMPL)
-	-$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+	-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
 	rename config.h $(CFGH_TMPL)
 
 $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
@@ -910,7 +910,7 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
 	$(XCOPY) *.h $(COREDIR)\*.*
 	$(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.*
 	$(RCOPY) include $(COREDIR)\*.*
-	-$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+	-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
 	if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
 
 $(MINIPERL) : $(MINIDIR) $(MINI_OBJ)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index e683091..eb55f9a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1146,7 +1146,7 @@ regen_config_h:
 	    $(CFGSH_TMPL) > ..\config.sh
 	cd .. && miniperl configpm
 	-del /f $(CFGH_TMPL)
-	-$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+	-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
 	rename config.h $(CFGH_TMPL)
 
 $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
@@ -1156,7 +1156,7 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
 	$(XCOPY) *.h $(COREDIR)\*.*
 	$(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.*
 	$(RCOPY) include $(COREDIR)\*.*
-	$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" \
+	$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \
 	    || $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE)
 
 $(MINIPERL) : $(MINIDIR) $(MINI_OBJ) $(CRTIPMLIBS)