Following b0e687f7 Win32 requires an -I..\lib for makedef.pl and x2p\*.PL

diff --git a/win32/Makefile b/win32/Makefile
index 8be691a..431b937 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -943,7 +943,7 @@ $(X2P_OBJ)  : $(CORE_H)
 
 perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl create_perllibst_h.pl
        $(MINIPERL) -I..\lib create_perllibst_h.pl
-       $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
+       $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
            CCTYPE=$(CCTYPE) > perldll.def
 
 $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
@@ -982,8 +982,8 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
        $(CC) -I..\x2p  $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c
 
 $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
-       $(MINIPERL) ..\x2p\find2perl.PL
-       $(MINIPERL) ..\x2p\s2p.PL
+       $(MINIPERL) -I..\lib ..\x2p\find2perl.PL
+       $(MINIPERL) -I..\lib ..\x2p\s2p.PL
        $(LINK32) -subsystem:console -out:$@ @<<
                $(LINK_FLAGS) $(LIBFILES) $(X2P_OBJ)
 <<

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 38b89d9..2bb2014 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1210,7 +1210,7 @@ $(X2P_OBJ)        : $(CORE_H)
 
 perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl create_perllibst_h.pl
        $(MINIPERL) -I..\lib create_perllibst_h.pl
-       $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \
+       $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \
        $(BUILDOPT) CCTYPE=$(CCTYPE) > perldll.def
 
 $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
@@ -1283,8 +1283,8 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
        $(CC) -I..\x2p  $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c
 
 $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
-       $(MINIPERL) ..\x2p\find2perl.PL
-       $(MINIPERL) ..\x2p\s2p.PL
+       $(MINIPERL) -I..\lib ..\x2p\find2perl.PL
+       $(MINIPERL) -I..\lib ..\x2p\s2p.PL
 .IF "$(CCTYPE)" == "BORLAND"
        $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
            @$(mktmp c0x32$(o) $(X2P_OBJ),$@,,$(LIBFILES),)