two small patches from Peter Prymmer <pvhp@forte.com>

p4raw-id: //depot/perl@4627

diff --git a/makedepend.SH b/makedepend.SH
index f03f68b..994123e 100755 (executable)
--- a/makedepend.SH
+++ b/makedepend.SH
@@ -130,6 +130,9 @@ for file in `$cat .clist`; do
        -e 's|\\$||' \
        -e p \
        -e '}' ) >UU/$file.c
+    if [ "$osname" = os390 -a "$file" = perly.c ]; then
+        $echo '#endif' >>UU/$file.c
+    fi
     $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
     $sed \
        -e '/^#.*<stdin>/d' \

diff --git a/win32/Makefile b/win32/Makefile
index e51b032..3be8bee 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -418,7 +418,6 @@ UTILS               =                       \
                ..\utils\c2ph           \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
-               ..\utils\pstruct        \
                ..\utils\perlcc         \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
@@ -1006,7 +1005,7 @@ distclean: clean
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        cd ..\utils
-       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc pstruct dprofpp
+       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc dprofpp
        -del /f *.bat
        cd ..\win32
        cd ..\x2p

diff --git a/win32/makefile.mk b/win32/makefile.mk
index a0f5f25..206796f 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -510,7 +510,6 @@ UTILS               =                       \
                ..\utils\c2ph           \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
-               ..\utils\pstruct        \
                ..\utils\perlcc         \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
@@ -1165,7 +1164,7 @@ distclean: clean
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \
-           dprofpp pstruct *.bat
+           dprofpp *.bat
        -cd ..\x2p && del /f find2perl s2p *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)