Meta v2

PDLPorters · Aug 18, 2015 · 73c6633 · 73c6633
1 parent 0954cc5
commit 73c6633
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 28 deletions.
diff --git a/Basic/Makefile.PL b/Basic/Makefile.PL
@@ -1,31 +1,14 @@
-# Stolen from PDL::Graphics::PLplot's Makefile.PL
 use ExtUtils::MakeMaker;
-eval {
-	require PDL::Core;
-	require PDL::Core::Dev;
-	PDL::Core::Dev->import;
-};
-my $pdl_installed = ($@) ? 0 : 1; # make always == 1 for install from PDL distro.
-
-if (!$pdl_installed) {
-	# write dummy makefile if PDL not installed
-	WriteMakefile(
-		'NAME'		=> 'PDL::Stats::Basic',
-		'PREREQ_PM'	=> { 'PDL' => '2.4.4' },
-	);
-	print STDERR "Wrote dummy Makefile for cpan install\n";
-	exit;
-} else {
-	if (defined(&PDL::indx)) {
-		print STDERR "*** PDL with 64bit support detected. ***\n*** Please note that PDL::Stats does not currently have 64bit support. ***\n";
-	}
+use PDL::Core::Dev;
+if (defined(&PDL::indx)) {
+        print STDERR "*** PDL with 64bit support detected. ***\n*** Please note that PDL::Stats does not currently have 64bit support. ***\n";
+}
 
-	eval q{
-		$package = ["stats_basic.pp",Basic,PDL::Stats::Basic];
-		%hash = pdlpp_stdargs($package);
+eval q{
+        $package = ["stats_basic.pp",Basic,PDL::Stats::Basic];
+        %hash = pdlpp_stdargs($package);
 
-		WriteMakefile( %hash );
+        WriteMakefile( %hash );
 
-		sub MY::postamble {pdlpp_postamble($package)};
-	};
-}
+        sub MY::postamble {pdlpp_postamble($package)};
+};
diff --git a/Makefile.PL b/Makefile.PL
@@ -22,9 +22,18 @@ WriteMakefile(
       ? ('LICENSE'=> 'perl')
       : ()),
     PREREQ_PM => {
-        'Test::More' => 0,
         'PDL::Core'  => 2.008,
     },
+    CONFIGURE_REQUIRES => {
+        'PDL::Core'  => 2.008,
+    },
+    BUILD_REQUIRES => {
+        'PDL::Core'  => 2.008,
+    },
+    TEST_REQUIRES => {
+        'PDL::Core'  => 2.008,
+        'Test::More' => 0,
+    },
     DIR                 => ['Basic', 'Distr', 'GLM', 'Kmeans', 'GSL', 'TS'],
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean               => { FILES => ['PDL-Stats-*'] },