[Bps-public-commit] r18553 - in Shipwright/trunk: lib/Shipwright/Script

[jesse at bestpractical.com]

Author: jesse
Date: Tue Feb 24 00:41:08 2009
New Revision: 18553

Modified:
   Shipwright/trunk/lib/Shipwright/Script/Import.pm
   Shipwright/trunk/share/bin/shipwright-builder

Log:
more work to get M::B to build without Pod::Man

Modified: Shipwright/trunk/lib/Shipwright/Script/Import.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Script/Import.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Script/Import.pm	Tue Feb 24 00:41:08 2009
@@ -354,7 +354,7 @@
         print "detected Module::Build build system\n";
         @commands = (
             'configure: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD_PL%% Build.PL --install_base=%%INSTALL_BASE%%',
-            'make: %%PERL%% Build',
+            'make: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build',
             'test: %%PERL%% Build test',
             'install: %%PERL%% Build install',
             'clean: %%PERL%% Build realclean',

Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Tue Feb 24 00:41:08 2009
@@ -541,10 +541,12 @@
     my $no_podman = ! $!;
     if ($no_podman || $args{'skip-man-pages'}) {
         $text =~ s/%%MODULE_BUILD_BEFORE_BUILD_PL%%/-MShipwright::Util::PatchModuleBuild/;
+        $text =~ s/%%MODULE_BUILD_BEFORE_BUILD%%/-MShipwright::Util::PatchModuleBuild/;
          $text =~ s/%%MAKEMAKER_CONFIGURE_EXTRA%%/INSTALLMAN1DIR=none INSTALLMAN3DIR=none/;
     } else {
          $text =~ s/%%MAKEMAKER_CONFIGURE_EXTRA%%//;
          $text =~ s/%%MODULE_BUILD_BEFORE_BUILD_PL%%//;
+         $text =~ s/%%MODULE_BUILD_BEFORE_BUILD%%//;
     }