Integrate from maint:

[ 18428]
Somehow I managed to get makefile.olds that didn't get cleaned away.
p4raw-link: @18428 on //depot/maint-5.8/perl: f7994f809f016f36fdf942940f6578ede7d474cf

p4raw-id: //depot/perl@18880
p4raw-integrated: from //depot/maint-5.8/perl@18428 'merge in'
	x2p/Makefile.SH (@17645..) Makefile.SH (@18173..)

diff --git a/Makefile.SH b/Makefile.SH
index 23ebd77..a062380 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -931,7 +931,7 @@ _cleaner2:
        rm -f t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests
        rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
        rm -rf $(addedbyconf)
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
        rm -f $(private) lib/Config.pod
        rm -rf lib/auto
        rm -f lib/.exists lib/*/.exists lib/*/*/.exists

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index db86be8..efe97b2 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -146,7 +146,7 @@ clean:
 realclean: clean
        -rmdir .depending
        rm -f core $(addedbyconf) all malloc.c
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
 
 veryclean: realclean
        rm -f *~ *.orig