summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-10-21 14:58:18 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-10-21 14:58:18 +0300
commitffcd63c07987b93e9474fc7b8a4a9ab9a003671f (patch)
tree7a238a4c5f909b643d41adb771b80149d6d555fe
parentcc0747f38c17f4f36d101af4e278ac84fd6451d5 (diff)
downloaddh-illumos-ffcd63c07987b93e9474fc7b8a4a9ab9a003671f.tar.gz
Refactored
-rwxr-xr-xdh_illumos_make7
1 files changed, 4 insertions, 3 deletions
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"!
);
}