Added option --no-onbld to dh_illumos_make

2 files changed, 19 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index ba16a27..c22a603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-illumos (3) unstable; urgency=low
+
+  * Added option --no-onlbd to dh_illumos_make
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 07 Jul 2012 21:00:03 +0000
+
 dh-illumos (2) unstable; urgency=low
 
   * Really useful version.
diff --git a/dh_illumos_make b/dh_illumos_make
index 0490c60..8627617 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -13,6 +13,7 @@ use Debian::Debhelper::Dh_Lib;
 
 B<dh_illumos_make> [S<I<debhelper options>>] [B<-m>I<make program>]
 [B<-t>I<target>] [B<--debug>] [B<--without-ctf>] [B<--without-mcs>]
+[B<--no-onbld>]
 [directories]
 
 =head1 DESCRIPTION
@@ -74,6 +75,13 @@ instead of
     These operations require MCS tool, which may not be available when bootstrapping.
     Likewise, variable C<MCS> will be defined as L<true(1)>.
 
+=item B<--no-onbld>
+
+    Do not use C<onbld> tools installed in system (F</opt/onbld>). Normally it only works
+    and useful for building C<onbld> itself. Otherwise F<illumos-gate/usr/src/tools>
+    must be unpacked and built before any other component.
+    If this option is given, F<bldenv.sh> is called with C<-t> option instead of C<+t>.
+
 =back
 
 =head1 NOTES
@@ -87,6 +95,7 @@ $dh{'MAKE'} = '/usr/bin/sunmake';
 $dh{'TARGET'} = 'install';
 $dh{'WITHOUT_CTF'} = 0;
 $dh{'WITHOUT_MCS'} = 0;
+$dh{'NO_ONBLD'} = 0;
 
 init(options => { 
     'make|m=s'    => \$dh{'MAKE'},
@@ -94,6 +103,7 @@ init(options => {
     'debug'       => \$dh{'DEBUG'},
     'without-ctf' => \$dh{'WITHOUT_CTF'},
     'without-mcs' => \$dh{'WITHOUT_MCS'},
+    'no-onbld'    => \$dh{'NO_ONBLD'},
 });
 
 my @dirs = ('usr/src');
@@ -118,7 +128,9 @@ foreach (qw/bldenv.sh env.sh/) {
 }
 
 my $opts = '';
-$opts = '-d' if $dh{'DEBUG'};
+$opts .= '-d' if $dh{'DEBUG'};
+my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
+$opts .= $onbld;
 
 my $env = '';
 $env .= ' MCS=true' if $dh{'WITHOUT_MCS'};