Changeset 081b79 in git

Timestamp:

Mar 10, 2021, 8:43:53 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

012df22c6999ddce26c08a1a3c5f27474054a013

Parents:

e116149bc2442a2ba73ebb392585573a36abcafd

Message:

doc/Makefile.in: Use TESTS_ENVIRONMENT so that the non-installed Singular finds its libraries

File:

• doc/Makefile.in (modified) (3 diffs)

doc/Makefile.in

@@ -11 +11 @@
 SINGUNAME       = spielwiese
 
-bindir          = @top_builddir@/Singular
+top_builddir    = @top_builddir@
+top_srcdir      = @top_srcdir@
+bindir          = ${top_builddir}/Singular
 EXEEXT          = @EXEEXT@
 
@@ -32 +34 @@
 
 # d2t stuff
-SINGULAR        = @top_builddir@/Singular/Singular
-SINGULAR_LIB_DIR= @top_srcdir@/Singular/LIB
+SINGULAR        = ${top_builddir}/Singular/Singular
+SINGULAR_LIB_DIR= ${top_srcdir}/Singular/LIB
+# from Singular/Makefile.am, extended by dynmodules stuff:
+TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables:$$(for d in ${top_builddir}/Singular/dyn_modules/*/.libs; do printf $$d:; done)' SINGULAR_ROOT_DIR='${top_builddir}'
 LIBPARSE        = ${bindir}/libparse${EXEEXT}
 DOC_SUBDIR      = ./d2t_singular
@@ -42 +46 @@
 # which tags to avoid:
 TAG             = polymake
-DOC2TEX         = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+DOC2TEX         = ${TESTS_ENVIRONMENT} ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
                   -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
                   -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
 
-DOC2TEX_M        = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+DOC2TEX_M        = ${TESTS_ENVIRONMENT} ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
                   -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
                   -exdir ${EX_SUBDIR}