Complement of change #21740 for Windows.

(I have the feeling that it's already subtly broken on VMS)
p4raw-link: @21740 on //depot/perl: a55f9fbc122e135334917b92ce41b3960365c082

p4raw-id: //depot/perl@21741

diff --git a/win32/Makefile b/win32/Makefile
index 099c9c1..9d55ff0 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -472,6 +472,8 @@ UTILS               =                       \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
                ..\utils\cpan           \
+               ..\utils\xsubpp         \
+               ..\utils\instmodsh      \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -483,7 +485,6 @@ UTILS               =                       \
                ..\x2p\find2perl        \
                ..\x2p\psed             \
                ..\x2p\s2p              \
-               ..\lib\ExtUtils\xsubpp  \
                bin\exetype.pl          \
                bin\runperl.pl          \
                bin\pl2bat.pl           \
@@ -1074,7 +1075,7 @@ distclean: clean
            podchecker podselect
        cd ..\utils
        -del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs perldoc perlivp \
-           dprofpp perlcc libnetcfg enc2xs piconv cpan
+           dprofpp perlcc libnetcfg enc2xs piconv cpan xsubpp instmodsh
        -del /f *.bat
        cd ..\win32
        cd ..\x2p

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 7bee82a..4f99bf9 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -592,6 +592,8 @@ UTILS               =                       \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
                ..\utils\cpan           \
+               ..\utils\xsubpp         \
+               ..\utils\instmodsh      \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -603,7 +605,6 @@ UTILS               =                       \
                ..\x2p\find2perl        \
                ..\x2p\psed             \
                ..\x2p\s2p              \
-               ..\lib\ExtUtils\xsubpp  \
                bin\exetype.pl          \
                bin\runperl.pl          \
                bin\pl2bat.pl           \
@@ -1199,7 +1200,8 @@ distclean: clean
            pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
-           perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat
+           perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
+           xsubpp instmodsh
        -cd ..\x2p && del /f find2perl s2p psed *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)