[Bps-public-commit] Shipwright branch, master, updated. dd715ddd51b8ba4eeac22ddaca0acb41b72e38b0

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  dd715ddd51b8ba4eeac22ddaca0acb41b72e38b0 (commit)
       via  fab9da17723d4f07397e12156ba6306eb7b3c9f4 (commit)
      from  e8eb6649f5149f2821cfdecea34890747a74cc2c (commit)

Summary of changes:
 lib/Shipwright/Script/Import.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit fab9da17723d4f07397e12156ba6306eb7b3c9f4
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sun Sep 13 23:11:52 2009 +0800

    don't use perl's archlib stuff, i.e. all perl modules live in as/blabla/lib/perl5

diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 1a6cd40..e447074 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -351,7 +351,7 @@ sub _generate_build {
     if ( -f catfile( $source_dir, 'Build.PL' ) ) { # &&  $source_dir !~ /Module-Build/ ) { # M::B should be bootstrapped with MakeMaker
         $self->log->info( 'detected Module::Build build system' );
         @commands = (
-            'configure: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD_PL%% Build.PL --install_base=%%INSTALL_BASE%%',
+            'configure: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD_PL%% Build.PL --install_base=%%INSTALL_BASE%% --install_path lib=%%INSTALL_BASE%%/lib/perl5 --install_path arch=%%INSTALL_BASE%%/lib/perl5',
             'make: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build',
             'test: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build test',
             'install: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build install',
@@ -363,7 +363,7 @@ sub _generate_build {
 # XXX when only support 5.8.9+, we can change it to INSTALL_BASE=%%INSTALL_BASE%%
 # because LIB=.../lib/perl5 is so ugly and not so right
         @commands = (
-            'configure: %%PERL%% Makefile.PL LIB=%%INSTALL_BASE%%/lib/perl5/ PREFIX=%%INSTALL_BASE%% %%MAKEMAKER_CONFIGURE_EXTRA%%',
+            'configure: %%PERL%% Makefile.PL LIB=%%INSTALL_BASE%%/lib/perl5/ PREFIX=%%INSTALL_BASE%% INSTALLSITEARCH=%%INSTALL_BASE%%/lib/perl5 INSTALLARCHLIB=%%INSTALL_BASE%%/lib/perl5 %%MAKEMAKER_CONFIGURE_EXTRA%%',
             'make: %%MAKE%%',
             'test: %%MAKE%% test',
             'install: %%MAKE%% install',

commit dd715ddd51b8ba4eeac22ddaca0acb41b72e38b0
Merge: fab9da1 e8eb664
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sun Sep 13 23:12:16 2009 +0800

    Merge branch 'master' of code.bestpractical.com:/git/shipwright


-----------------------------------------------------------------------