From ffcd63c07987b93e9474fc7b8a4a9ab9a003671f Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 21 Oct 2015 14:58:18 +0300 Subject: Refactored --- dh_illumos_make | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dh_illumos_make') diff --git a/dh_illumos_make b/dh_illumos_make index 9daa786..4b788b2 100755 --- a/dh_illumos_make +++ b/dh_illumos_make @@ -135,8 +135,9 @@ my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t'; $opts .= $onbld; my $override = ''; -$override .= ' CTFCONVERT=:' if not $dh{'CTF'}; -$override .= ' CTFMERGE=:' if not $dh{'CTF'}; +if ( !$dh{CTF} ) { + $override .= ' CTFCONVERT=: CTFMERGE=:'; +} if ( $dh{ROOT} ) { doit( 'mkdir', '-p', $dh{ROOT} ); @@ -158,7 +159,7 @@ if ( $dh{'NATIVE'} ) { foreach (@dirs) { my $root = s!(.*)usr/.*!$1!r; complex_doit( -qq!ksh93 ${root}usr/bldenv.sh $opts ${root}usr/env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}$override"! +qq!ksh93 ${root}usr/bldenv.sh $opts ${root}usr/env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'} $override"! ); } -- cgit v1.2.3