X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=inc%2FMy%2FBuild.pm;h=575ca455c09891febe92ed2529e724d6752d3bcd;hb=e20f71b47a5d11a3554652128c110ce23f36ecdd;hp=33bfc2b05ae15ad8dc83fbb4324a485d2483ea58;hpb=23f5d71553692b5d53978eedeb8a7323a14ba988;p=chaz%2Fp5-Alien-ZMQ

diff --git a/inc/My/Build.pm b/inc/My/Build.pm
index 33bfc2b..575ca45 100644
--- a/inc/My/Build.pm
+++ b/inc/My/Build.pm
@@ -10,7 +10,6 @@ use Cwd qw/realpath/;
 use Digest::SHA qw/sha1_hex/;
 use File::Path qw/remove_tree/;
 use File::Spec::Functions qw/catdir catfile/;
-use IPC::Cmd qw/can_run run/;
 use LWP::Simple qw/getstore RC_OK/;
 use Module::Build;
 
@@ -102,9 +101,9 @@ END
 
         # use -I and -L flag arguments as extra search directories
         my $inc = `$pkg_config $pkg --cflags-only-I`;
-        push @inc_search, map { s/^-I//; $_ } split(/\s+/, $inc);
+        push @inc_search, map { s/^-I//; $_ } $cb->split_like_shell($inc);
         my $lib = `$pkg_config $pkg --libs-only-L`;
-        push @lib_search, map { s/^-L//; $_ } split(/\s+/, $lib);
+        push @lib_search, map { s/^-L//; $_ } $cb->split_like_shell($lib);
 
         last;
     }
@@ -153,8 +152,7 @@ END
 
 sub install_zeromq {
     my $self = shift;
-
-    can_run("libtool") or die "The libtool command cannot be found";
+    my $cb = $self->cbuilder;
 
     my $version = $self->notes('zmq-version');
     my $sha1 = $self->notes('zmq-sha1');
@@ -182,16 +180,16 @@ sub install_zeromq {
     my $srcdir  = catdir($basedir, "zeromq-$version");
 
     say "Configuring...";
-    my @config = split(/\s/, $self->args('zmq-config') || "");
+    my @config = $cb->split_like_shell($self->args('zmq-config') || "");
     chdir $srcdir;
-    run(command => ["./configure", "--prefix=$prefix", @config])
+    $cb->do_system("./configure", "--prefix=$prefix", @config)
         or die "Failed to configure ØMQ";
 
     say "Compiling...";
-    run(command => ['make']) or die "Failed to make ØMQ";
+    $cb->do_system("make") or die "Failed to make ØMQ";
 
     say "Installing...";
-    run(command => [qw|make install prefix=/|, "DESTDIR=$datadir"])
+    $cb->do_system(qw|make install prefix=/|, "DESTDIR=$datadir")
         or die "Failed to install ØMQ";
 
     chdir $basedir;