t/x2p/s2p.t fix for VMS in UNIX mode

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 2c54ee9..1f1120c 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -388,10 +388,10 @@ DELAYLOAD = -DELAYLOAD:ws2_32.dll delayimp.lib
 # installed too.
 !IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \
     "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE"
-EMBED_EXE_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;1 && \
-                 del $@.manifest
-EMBED_DLL_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;2 && \
-                 del $@.manifest
+EMBED_EXE_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \
+                 if exist $@.manifest del $@.manifest
+EMBED_DLL_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \
+                 if exist $@.manifest del $@.manifest
 !ENDIF
 
 ARCHDIR                = ..\lib\$(ARCHNAME)
@@ -616,7 +616,6 @@ UTILS               =                       \
                ..\utils\cpan2dist      \
                ..\utils\shasum         \
                ..\utils\instmodsh      \
-               ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
                ..\pod\pod2man          \
@@ -1187,6 +1186,7 @@ distclean: realclean
        -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
        -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable
        -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP
+       -if exist $(LIBDIR)\mro rmdir /s /q $(LIBDIR)\mro
        -if exist $(LIBDIR)\IO\Compress rmdir /s /q $(LIBDIR)\IO\Compress
        -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket
        -if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress
@@ -1198,7 +1198,7 @@ distclean: realclean
        -if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads
        -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
        -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
-       -cd $(PODDIR) && del /f *.html *.bat checkpods \
+       -cd $(PODDIR) && del /f *.html *.bat podchecker \
            perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
            perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
            perldelta.pod perldgux.pod perldos.pod perlepoc.pod \