Move scrapecore script. Perl corelist will be bundled now.

The core module list for perl might as well be bundled with genpkg.
The setup script will install it to the proper place. The scrapecore
script will still be included for completeness but shouldn't have to
be used by the user, hopefully.

3 files changed, 5 insertions, 8 deletions

diff --git a/preps/perl.d/scrapecore b/misc/perlcore
index 8fe1530..8fe1530 100755
--- a/preps/perl.d/scrapecore
+++ b/misc/perlcore
diff --git a/preps/perl.d/perl-dist b/preps/perl.d/perl-dist
index 05269f3..c465b03 100755
--- a/preps/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -330,16 +330,14 @@ sub _nocore
 {
 	my(@mods) = @_;
 
-	my $cmpath = _vardir() . '/coremods';
+	my $cmpath = _vardir() . '/perlcore.mods';
 	unless(-f $cmpath){
-		my $scpath = ($ENV{'PREPSPATH'}
-			? "$ENV{'PREPSPATH'}/perl.d/scrapecore"
-			: q{genpkg's preps/perl.d/scrapecore});
 		print STDERR <<"END_ERR";
 $PROG: error: $cmpath is missing.
 ******************************************************************************
-  You must generate it with $scpath.
-  Run it against the version of perl that is the official package.
+  This file should have been installed along with genpkg. Copy the file from
+  genpkg's source or generate it with the misc/perlcore script in genpkg's
+  source. Make sure to use the same version as the perl you are using.
 ******************************************************************************
 END_ERR
 		exit 1;
diff --git a/setup b/setup
index 76eb68d..e995c25 100755
--- a/setup
+++ b/setup
@@ -6,8 +6,7 @@ prog=setup
 binfiles='genpkg prepkg modpkg pbfields putpkgtree getpkgtree
 	injectdigs vervar'
 preps='perl perl.d/
-	perl.d/fetchcpan perl.d/perl-dist perl.d/perl-pkgbuild
-	perl.d/scrapecore'
+	perl.d/fetchcpan perl.d/perl-dist perl.d/perl-pkgbuild'
 
 md()
 {