diff --git a/configure.ac b/configure.ac index 6c707df2..9163e688 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,7 @@ if [[ "${make_pykat}" == "yes" ]]; then AX_PYTHON_MODULE(numpy, [AC_MSG_ERROR([numpy not found])], ${pybin}) AX_PYTHON_MODULE(matplotlib, [AC_MSG_ERROR([matplotlib not found])], ${pybin}) AX_PYTHON_MODULE(scipy, [AC_MSG_ERROR([scipy not found])], ${pybin}) - AX_PYTHON_MODULE(tabulate, [AC_MSG_ERROR([scipy not found])], ${pybin}) + AX_PYTHON_MODULE(tabulate, [AC_MSG_ERROR([tabulate not found])], ${pybin}) #AC_DEFINE([HAVE_PYTHON], [1], [Python present]) #AC_DEFINE_UNQUOTED([KAT_SITE_PKGS], ["${libdir}/$pybin/site-packages"], [KAT module site-packages at installed location]) diff --git a/doc/Makefile b/doc/Makefile index d2bce4cb..d6d3c7fd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -10,7 +10,7 @@ MKDIR_P = mkdir -p INSTALL = /usr/bin/install -c -m 644 # Set autoconf variables -prefix = /home/dan/software/kat_test/nopyinstall +prefix = /usr/local PACKAGE_TARNAME = kat top_srcdir = .. srcdir = . diff --git a/lib/include/kat/kat_fs.hpp b/lib/include/kat/kat_fs.hpp index 42f6fb9a..cfff53ce 100644 --- a/lib/include/kat/kat_fs.hpp +++ b/lib/include/kat/kat_fs.hpp @@ -125,7 +125,8 @@ namespace kat { } else { path kcc(canonicalExe.parent_path()); - if (exists("kat.cc")) { + kcc /= "kat.cc"; + if (exists(kcc)) { // If we are here then we are not running from an installed location, // we are running from the source tree. // Not 100% sure how far back we need to go (depends on whether using KAT exe or tests)