don't clobber *.orig files on *clean targets

p4raw-id: //depot/perl@6383

diff --git a/Makefile.SH b/Makefile.SH
index a80e93b..c691614 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -705,7 +705,7 @@ _cleaner:
        -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
        $(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
        done
-       rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/forktmp* t/tmp* t/c t/perl .?*.c so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
+       rm -f core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/forktmp* t/tmp* t/c t/perl .?*.c so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
        rm -rf $(addedbyconf)
        rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
        rm -f $(private)

diff --git a/ext/IPC/SysV/Makefile.PL b/ext/IPC/SysV/Makefile.PL
index 60dd74d..b87f179 100644 (file)
--- a/ext/IPC/SysV/Makefile.PL
+++ b/ext/IPC/SysV/Makefile.PL
@@ -13,7 +13,7 @@ sub MY::libscan
  return '' 
        if($path =~ m:/(RCS|CVS|SCCS)/: ||
           $path =~ m:[~%]$: ||
-          $path =~ m:\.(orig|rej)$:
+          $path =~ m:(\.(orig|rej)|~)$:
          );
  
  $path;
@@ -31,7 +31,7 @@ WriteMakefile(
  
        'clean'         => {FILES => join(" ",
                                        map { "$_ */$_ */*/$_" }
-                                       qw(*% *.html *.b[ac]k *.old *.orig))
+                                       qw(*% *.html *.b[ac]k *.old))
                           },
        'macro'         => { INSTALLDIRS => 'perl' },
 );

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 8ed7d31..ce5c46c 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -135,7 +135,7 @@ clean:
        rm -f a2p *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
-       rm -f *.orig core $(addedbyconf) all malloc.c
+       rm -f core $(addedbyconf) all malloc.c
        rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
 
 # The following lint has practically everything turned on.  Unfortunately,