Change 18880 by [EMAIL PROTECTED] on 2003/03/10 16:17:50
Integrate from maint:
[ 18428]
Somehow I managed to get makefile.olds that didn't get cleaned away.
Affected files ...
... //depot/perl/Makefile.SH#260 integrate
... //depot/perl/x2p/Makefile.SH#33 integrate
Differences ...
==== //depot/perl/Makefile.SH#260 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#259~18851~ Fri Mar 7 22:49:35 2003
+++ perl/Makefile.SH Mon Mar 10 08:17:50 2003
@@ -931,7 +931,7 @@
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
==== //depot/perl/x2p/Makefile.SH#33 (xtext) ====
Index: perl/x2p/Makefile.SH
--- perl/x2p/Makefile.SH#32~18675~ Sat Feb 8 11:49:40 2003
+++ perl/x2p/Makefile.SH Mon Mar 10 08:17:50 2003
@@ -146,7 +146,7 @@
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
End of Patch.
