perl-Gtk2 r2092 - trunk

[tsch svn gnome org]

Author: tsch
Date: Sun Nov 16 20:41:09 2008
New Revision: 2092
URL: http://svn.gnome.org/viewvc/perl-Gtk2?rev=2092&view=rev

Log:
Unconditionally use META_MERGE.  Tell the CPAN indexer to ignore the
directories "tools" and "xs".


Modified:
   trunk/ChangeLog
   trunk/Makefile.PL

Modified: trunk/Makefile.PL
==============================================================================
--- trunk/Makefile.PL	(original)
+++ trunk/Makefile.PL	Sun Nov 16 20:41:09 2008
@@ -268,9 +268,6 @@
 our @exports;
 require 'Gtk2.exports';
 
-my $configure_requires_yaml =
-  Glib::MakeHelper->get_configure_requires_yaml(%PREREQ_PM);
-
 WriteMakefile(
     NAME          => 'Gtk2',
     VERSION_FROM  => 'Gtk2.pm', # finds $VERSION
@@ -281,11 +278,12 @@
     FUNCLIST      => \ exports,
     DL_FUNCS      => { Gtk2 => [] },
 
-    $gtk2->get_makefile_vars,
+    META_MERGE    => {
+      configure_requires => \%PREREQ_PM,
+      no_index           => { directory => [qw/tools xs/] },
+    },
 
-    $ExtUtils::MakeMaker::VERSION >= 6.46
-      ? (META_MERGE => { configure_requires => \%PREREQ_PM })
-      : (EXTRA_META => $configure_requires_yaml),
+    $gtk2->get_makefile_vars,
 );
 
 =unstable