perl-GStreamer r85 - trunk

[tsch svn gnome org]

Author: tsch
Date: Wed Nov 26 20:55:46 2008
New Revision: 85
URL: http://svn.gnome.org/viewvc/perl-GStreamer?rev=85&view=rev

Log:
Use META_MERGE instead of EXTRA_META.


Modified:
   trunk/ChangeLog
   trunk/Makefile.PL

Modified: trunk/Makefile.PL
==============================================================================
--- trunk/Makefile.PL	(original)
+++ trunk/Makefile.PL	Wed Nov 26 20:55:46 2008
@@ -131,7 +131,8 @@
 $gst->set_libs($pkgcfg{libs});
 $gst->add_xs(@xs_files);
 $gst->add_pm('GStreamer.pm' => '$(INST_LIBDIR)/GStreamer.pm');
-$gst->add_typemaps(map {File::Spec->catfile(cwd(), $_)} ('gst.typemap', 'build/gst2perl.typemap'));
+$gst->add_typemaps(map {File::Spec->catfile(cwd(), $_)}
+                       ('gst.typemap', 'build/gst2perl.typemap'));
 
 $gst->install(qw(gst2perl.h
                  build/gst2perl-autogen.h
@@ -139,9 +140,6 @@
                  doctypes));
 $gst->save_config('build/IFiles.pm');
 
-my $configure_requires =
-  Glib::MakeHelper->get_configure_requires_yaml(%pre_reqs);
-
 WriteMakefile(
   NAME          => 'GStreamer',
   VERSION_FROM  => 'GStreamer.pm',
@@ -150,11 +148,11 @@
   XSPROTOARG    => '-noprototypes',
   MAN3PODS      => \%pod_files,
 
-  $gst->get_makefile_vars,
+  META_MERGE    => {
+    configure_requires => \%pre_reqs,
+  },
 
-  EXTRA_META    => qq/
-$configure_requires
-/,
+  $gst->get_makefile_vars,
 );
 
 sub MY::postamble {