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

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Feb 15 23:25:25 2009
New Revision: 18411

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

Log:
 r19889 at sunnavys-mb:  sunnavy | 2009-02-16 12:24:05 +0800
 add inc_lib to PERL5LIB


Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sun Feb 15 23:25:25 2009
@@ -263,6 +263,7 @@
         $ENV{PERL5LIB} =
             catdir( $args{'install-base'}, 'lib', 'perl5', 'site_perl' ) . ':'
           . catdir( $args{'install-base'}, 'lib', 'perl5' ) . ':'
+          . $inc_lib . ':'
           . $ENV{PERL5LIB};
         $ENV{PATH} =
             catdir( $args{'install-base'}, 'bin' ) . ':'
@@ -356,7 +357,6 @@
     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,
            '-MShipwright::Util::CleanINC',
           catfile( '..', '..', 'scripts', $dir, 'build.pl' ),
           '--install-base' => $args{'install-base'},
@@ -500,7 +500,7 @@
     }
 
     my $perl_archname = `$perl -MConfig -e 'print \$Config{archname}'`;
-    $text =~ s/%%PERL%%/$perl -I$build_base -MShipwright::Util::CleanINC/g;
+    $text =~ s/%%PERL%%/$perl -MShipwright::Util::CleanINC/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%MAKE%%/$args{make}/g;