dh_illumos_make: building in a directory other than the current directory

1 files changed, 2 insertions, 11 deletions

diff --git a/dh_illumos_make b/dh_illumos_make
index b42b01a..f02cefb 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -118,16 +118,6 @@ foreach (@dirs) {
     }
 }
 
-# Build in each dir:
-# Sanity checks:
-foreach (qw/bldenv.sh env.sh/) {
-    if ( !-r "usr/$_" ) {
-        error(
-"`$_' not found under 'usr/'. Maybe illumos sources were not properly unpacked."
-        );
-    }
-}
-
 my $opts = '';
 $opts .= '-d' if $dh{'DEBUG'};
 my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
@@ -148,8 +138,9 @@ if ( $dh{'NATIVE'} ) {
 }
 
 foreach (@dirs) {
+    my $root = s!(.*)usr/.*!$1!r;
     complex_doit(
-qq!ksh93 usr/bldenv.sh $opts 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"!
     );
 }