perl-Glib r1082 - trunk

[tsch svn gnome org]

Author: tsch
Date: Thu Feb  5 17:00:08 2009
New Revision: 1082
URL: http://svn.gnome.org/viewvc/perl-Glib?rev=1082&view=rev

Log:
Unconditionally use META_MERGE; so you now need ExtUtils::MakeMaker >= 6.46 to
roll a Glib tarball with a proper META.yml.  Also, tell the CPAN indexer (via
META.yml) to not index xsapi.pod.head and xsapi.pod.foot.


Modified:
   trunk/ChangeLog
   trunk/Makefile.PL

Modified: trunk/Makefile.PL
==============================================================================
--- trunk/Makefile.PL	(original)
+++ trunk/Makefile.PL	Thu Feb  5 17:00:08 2009
@@ -144,9 +144,6 @@
 our @exports;
 require 'Glib.exports';
 
-my $configure_requires_yaml =
-  Glib::MakeHelper->get_configure_requires_yaml(%PREREQ_PM);
-
 WriteMakefile(
     NAME		=> 'Glib',
     VERSION_FROM	=> 'Glib.pm', # finds $VERSION
@@ -157,11 +154,11 @@
     FUNCLIST		=> \ exports,
     DL_FUNCS		=> { Glib => [] },
 
-    $glib ? $glib->get_makefile_vars : (),
+    META_MERGE		=> {
+      configure_requires => \%PREREQ_PM,
+      no_index           => { files => [qw/xsapi.pod.head xsapi.pod.foot/] } },
 
-    $ExtUtils::MakeMaker::VERSION >= 6.46
-      ? (META_MERGE => { configure_requires => \%PREREQ_PM })
-      : (EXTRA_META => $configure_requires_yaml),
+    $glib ? $glib->get_makefile_vars : (),
 );
 
 #=unstable