Continue getting configure/python stuff working

nasa · Feb 8, 2022 · 8fba099 · 8fba099
1 parent 652095b
commit 8fba099
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/config/m4/ac_python_devel.m4 b/config/m4/ac_python_devel.m4
@@ -339,14 +339,13 @@ $ac_numpy_result])
 	CPPFLAGS="$ac_save_CPPFLAGS"
 	LIBS="$ac_save_LIBS"
 	fi
-      pythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(False,False,''))"`
-      platpythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(True,False,''))"`
-      pythondir="\${prefix}/${pythondir}"
-      platpythondir="\${prefix}/${platpythondir}"
-      AC_SUBST([platpythondir])
     fi
+    pythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(False,False,''))"`
+    platpythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(True,False,''))"`
+    pythondir="\${prefix}/${pythondir}"
+    platpythondir="\${prefix}/${platpythondir}"
+    AC_SUBST([platpythondir])
 fi
-AC_SUBST([pythondir], [${pythondir}])
 AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
 AM_CONDITIONAL([BUILD_PYTHON_SWIG], [test "$build_python_swig" = "yes"])
 ])
diff --git a/configure b/configure
@@ -25143,15 +25143,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 	CPPFLAGS="$ac_save_CPPFLAGS"
 	LIBS="$ac_save_LIBS"
 	fi
-      pythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(False,False,''))"`
-      platpythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(True,False,''))"`
-      pythondir="\${prefix}/${pythondir}"
-      platpythondir="\${prefix}/${platpythondir}"
-
     fi
-fi
-pythondir=${pythondir}
+    pythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(False,False,''))"`
+    platpythondir=`$PYTHON -c "from distutils.sysconfig import *; print(get_python_lib(True,False,''))"`
+    pythondir="\${prefix}/${pythondir}"
+    platpythondir="\${prefix}/${platpythondir}"
 
+fi
 pkgpythondir=\${pythondir}/$PACKAGE
 
  if test "$build_python_swig" = "yes"; then