diff --git a/v2.5/generators/nlojet++/configure.ac b/v2.5/generators/nlojet++/configure.ac index 48756ce3be13b69a8b5a3add14570014df825365..a0b56d5fee08b1dca4a8865aad0b60b182848b3e 100644 --- a/v2.5/generators/nlojet++/configure.ac +++ b/v2.5/generators/nlojet++/configure.ac @@ -174,10 +174,12 @@ if test "x$with_fnlotoolkit" != "xno"; then AC_SUBST([FNLOTOOLKITBINPATH], ["$FNLOTOOLKITPREFIX/bin"]) AC_SUBST([FNLOTOOLKITLIBPATH], [`$FNLOTOOLKITBIN --libdir`]) AC_SUBST([FNLOTOOLKITINCLUDEPATH],[`$FNLOTOOLKITBIN --incdir`]) + AC_SUBST([FNLOTOOLKITPYTHONPATH],[`$FNLOTOOLKITBIN --pythondir`]) AC_MSG_RESULT([Using $FNLOTOOLKITPREFIX for the $TMPNAM installation path]) AC_MSG_RESULT([Using $FNLOTOOLKITBINPATH for the binaries]) AC_MSG_RESULT([Using $FNLOTOOLKITLIBPATH for the library]) AC_MSG_RESULT([Using $FNLOTOOLKITINCLUDEPATH for the includes]) + AC_MSG_RESULT([Using $FNLOTOOLKITPYTHONPATH for python extentions]) else AC_MSG_ERROR([No $TMPNAM library found. Configuration aborted!]) fi diff --git a/v2.5/generators/nlojet++/interface/check/Makefile.am b/v2.5/generators/nlojet++/interface/check/Makefile.am index e9a9c3cdf8cad1abc4582b30a7101d9a8e08274e..ade0ce8c6352c05eaf671449eff2ae105988b7b9 100644 --- a/v2.5/generators/nlojet++/interface/check/Makefile.am +++ b/v2.5/generators/nlojet++/interface/check/Makefile.am @@ -15,7 +15,7 @@ AUTOMAKE_OPTIONS = gnu # perl script targets to check the package (distributed, but not installed) # dist_check_SCRIPTS = fnlo-nj-wrmtest.pl fnlo-nj-lotest.pl fnlo-nj-nlotest.pl fnlo-compare-tables.py -TESTS_ENVIRONMENT = LIBDIR=$(shell fnlo-tk-config --libdir) PYTHONPATH=$(shell fnlo-tk-config --pythondir) +TESTS_ENVIRONMENT = LIBDIR=${FNLOTOOLKITLIBPATH} PYTHONPATH=${FNLOTOOLKITPYTHONPATH}:${PYTHONPATH} TESTS = $(dist_check_SCRIPTS) # Additional clean up for check targets