Merge branch 't/31365/add_ntl_to_cython_aliases' into t/31377/__confi…

…gure___enable_editable
sagemath · Feb 11, 2021 · 18df2dc · 18df2dc
2 parents 36bbd6c + 993c35c
commit 18df2dc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/build/pkgs/ntl/spkg-configure.m4 b/build/pkgs/ntl/spkg-configure.m4
@@ -50,8 +50,11 @@ SAGE_SPKG_CONFIGURE([ntl], [
     else
         AC_SUBST(SAGE_NTL_PREFIX, [''])
         AX_ABSOLUTE_HEADER([NTL/ZZ.h])
-        AC_SUBST(NTL_INCDIR, [`AS_DIRNAME(AS_DIRNAME($gl_cv_absolute_NTL_ZZ_h))`])
-        AC_SUBST(NTL_LIBDIR, [`AS_DIRNAME($NTL_INCDIR)/lib`])
+        ntl_inc_ntl_dir=`AS_DIRNAME(["$gl_cv_absolute_NTL_ZZ_h"])`
+        ntl_inc_dir=`AS_DIRNAME(["$ntl_inc_ntl_dir"])`
+        ntl_prefix=`AS_DIRNAME(["$ntl_inc_dir"])`
+        AC_SUBST(NTL_INCDIR, [$ntl_inc_dir])
+        AC_SUBST(NTL_LIBDIR, [$ntl_prefix/lib])
     fi
 ])