Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 06 Jun 2016 11:24:46 +0200
Description: Make sure libncbi-vdb will be found

--- a/setup/package.prl
+++ b/setup/package.prl
@@ -23,9 +23,9 @@ sub REQ { (
               origin  => 'I',
               type    => 'L',
               srcpath => '/usr/include',
-              pkgpath => '/usr/local/ngs/ngs-sdk',
+              pkgpath => '/usr',
               usrpath =>      '$HOME/ngs/ngs-sdk',
-              bldpath => '$HOME/ncbi-outdir/ngs-sdk',
+              bldpath => '/usr',
               locbldpath=>'$Bin/../../OUTDIR/ngs-sdk',
               include => 'ngs/itf/Refcount.h',
               lib     => 'libngs-c++.a',
@@ -36,8 +36,8 @@ sub REQ { (
               boption => 'with-ncbi-vdb-build',
               origin  => 'I',
               type    => 'SB',
-              srcpath => '../ncbi-vdb',
-              pkgpath => '/usr/local/ncbi/ncbi-vdb',
+              srcpath => '/usr/include/ncbi-vdb',
+              pkgpath => '/usr/lib/ncbi-vdb',
               usrpath =>      '$HOME/ncbi/ncbi-vdb',
               bldpath => '$HOME/ncbi-outdir/ncbi-vdb',
               locbldpath=>'$Bin/../../OUTDIR/ncbi-vdb',
--- a/setup/konfigure.perl
+++ b/setup/konfigure.perl
@@ -1340,6 +1340,9 @@ sub find_in_dir {
         } elsif (-e "$dir/interfaces/$include") {
             println $dir unless ($AUTORUN);
             $found_inc = "$dir/interfaces";
+        } elsif (-e "$dir/include/ncbi-vdb") {
+            println $dir unless ($AUTORUN);
+            $found_inc = "$dir/include/ncbi-vdb";
         } else {
             print "$dir: " if ($OPT{'debug'});
             println 'no' unless ($AUTORUN);
@@ -1352,7 +1355,7 @@ sub find_in_dir {
             my $buildarch = `dpkg-architecture -qDEB_BUILD_MULTIARCH`;
             chomp $buildarch;
             my $libdir  = File::Spec->catdir($dir, 'lib', $buildarch);
-            my $ilibdir = File::Spec->catdir($builddir, 'ilib');
+            my $ilibdir = File::Spec->catdir($dir, 'lib', $buildarch);
             my $f = File::Spec->catdir($libdir, $lib);
             print "\n\t\tchecking $f\n\t" if ($OPT{'debug'});
             my $found;