r53278 - in /trunk/dh-make-perl: TODO debian/changelog lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Feb 23 20:15:21 2010
New Revision: 53278

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53278
Log:
fix build-system detection when M::B::C is in play

use 'MakeMaker' when both Makefile.PL and Build.PL
are present and the former is NOT a
Module::Build::Compat wrapper

Modified:
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=53278&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Tue Feb 23 20:15:21 2010
@@ -27,6 +27,4 @@
   touches d/rules if quilt is used
 * quiltification: switch to "--with quilt" in d/rules and adjust build deps
   in non-'3.0 (quilt)' source formats
-* Don't add libmodule-build-perl to Build-Depends if Makefile.PL is also
-  present, if its not just Module::Build::Compat
 * --make should use Debian::Control::FromCPAN for dependencies

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=53278&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Feb 23 20:15:21 2010
@@ -7,6 +7,7 @@
   * when looking for docs, ignore .svn/ too
   * do not crash when APT's package cache cannot be opened
   * explain reasons when bumping build-dependencies on debhelper/quilt/etc
+  * fix build-system detection when Module::Build::Compat is in play
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 19 Feb 2010 22:47:26 +0200
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53278&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Tue Feb 23 20:15:21 2010
@@ -2162,6 +2162,12 @@
 sub module_build {
     my $self = shift;
 
+    # dehbelper prefers Makefile.PL over Build.PL unless the former is a
+    # Module::Build::Compat wrapper
+    return 'Module-Build' if $self->makefile_pl_is_MBC;
+
+    return 'MakeMaker' if -e $self->makefile_pl;
+
     return ( -f $self->main_file('Build.PL') ) ? "Module-Build" : "MakeMaker";
 }