[Bps-public-commit] r18407 - in Shipwright/trunk: share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Feb 15 21:58:08 2009
New Revision: 18407

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r19883 at sunnavys-mb:  sunnavy | 2009-02-16 10:57:53 +0800
 substitute %%PERL%% with -I$build_base -Minc::Shipwright::Util::CleanINC to clean inc


Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sun Feb 15 21:58:08 2009
@@ -354,6 +354,7 @@
     if ( -e catfile( '..', '..', 'scripts', $dir, 'build.pl' ) ) {
         print $log "found build.pl for $dir, will install $dir using that\n";
         my $cmd = join ' ', $args{perl} || $^X,
+           '-I' . $build_base,
            '-Minc::Shipwright::Util::CleanINC',
           catfile( '..', '..', 'scripts', $dir, 'build.pl' ),
           '--install-base' => $args{'install-base'},
@@ -497,7 +498,7 @@
     }
 
     my $perl_archname = `$perl -MConfig -e 'print \$Config{archname}'`;
-    $text =~ s/%%PERL%%/$perl/g;
+    $text =~ s/%%PERL%%/$perl -I$build_base -Minc::Shipwright::Util::CleanINC/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%MAKE%%/$args{make}/g;