clean Distar and MANIFEST files in realclean

[p5sagit/Distar.git] / lib / Distar.pm

diff --git a/lib/Distar.pm b/lib/Distar.pm
index 0fa8961..ae72c84 100644 (file)
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -30,8 +30,6 @@ sub author {
     if !ref $Author;
 }
 
-our $Ran_Preflight;
-
 our @Manifest = (
   'lib' => '.pm',
   'lib' => '.pod',
@@ -48,7 +46,7 @@ sub manifest_include {
   push @Manifest, @_;
 }
 
-my $readme_generator = <<README;
+my $readme_generator = <<'README';
        pod2text $(VERSION_FROM) >$(DISTVNAME)/README
        $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-readme-to-manifest
 README
@@ -77,7 +75,6 @@ sub write_manifest_skip {
 }
 
 sub run_preflight {
-  $Ran_Preflight = 1;
   my $version = $ARGV[0];
 
   my $make = $Config{make};
@@ -137,9 +134,19 @@ sub run_preflight {
       %$args,
       ABSTRACT_FROM => $args->{VERSION_FROM},
       test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t xt/*/*.t' },
+      realclean => { FILES => (
+        ($args->{realclean}{FILES}||'')
+        . ' Distar/ MANIFEST.SKIP MANIFEST MANIFEST.bak'
+      ) },
     });
   }
 
+  sub flush {
+    my $self = shift;
+    Distar::write_manifest_skip();
+    $self->SUPER::flush(@_);
+  }
+
   sub dist_test {
     my $self = shift;
     my $dist_test = $self->SUPER::dist_test(@_) . <<'END'
@@ -171,8 +178,4 @@ END
   }
 }
 
-END {
-  write_manifest_skip() unless $Ran_Preflight
-}
-
 1;