Skip to content

Commit

Permalink
Finish Hotfix-4
Browse files Browse the repository at this point in the history
Fixing a bug that occured when trying to run kat from src dir.
  • Loading branch information
maplesond committed Mar 19, 2018
2 parents 0e8c490 + b297a18 commit 4c714c5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = .
Expand Down
3 changes: 2 additions & 1 deletion lib/include/kat/kat_fs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4c714c5

Please sign in to comment.