Skip to content
Snippets Groups Projects
Commit d14b0123 authored by Klaus Rabbertz's avatar Klaus Rabbertz
Browse files

For makefile portability remove commands from Makefile.am and use AC_SUBST...

For makefile portability remove commands from Makefile.am and use AC_SUBST variables from configure.ac instead
parent 5bb15e5b
Branches
Tags
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment