1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
Description: Fix distutils path for setuptools
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2023-02-06
Forwarded: no
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -33,7 +33,7 @@
EXTRA_DIST = pydirfile.c pygetdata.c pyentry.c gdpy_intern.h pyfragment.c
-distutils_path=build/lib.${PYTHON_PLATFORM}-${PYTHON_VERSION}
+distutils_path=build/lib.${PYTHON_PLATFORM}-cpython-${PYTHON_VERSION_NODOT}
pygetdata${PYTHON_OBJECT_SUFFIX}: ${distutils_path}/pygetdata${PYTHON_OBJECT_SUFFIX}
cp $< $@
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -162,8 +162,10 @@
AC_MSG_CHECKING([$PYTHON version])
PYTHON_VERSION=`$PYTHON -c "import sys; print (f'{sys.version_info.major}.{sys.version_info.minor}')"`
+PYTHON_VERSION_NODOT=`$PYTHON -c "import sys; print (f'{sys.version_info.major}{sys.version_info.minor}')"`
AC_MSG_RESULT([$PYTHON_VERSION])
AC_SUBST([PYTHON_VERSION])
+AC_SUBST([PYTHON_VERSION_NODOT])
dnl Python ABI version (which can be different than VERISON in python3)
AC_MSG_CHECKING([Python ABI version])
|