From 1245b090126b8e2eeeda599b01b6b085d3607353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 29 May 2024 17:13:30 +0200 Subject: [PATCH] build,python: Fix make distcheck for Python 3.9+ * lang/python/Makefile.am (uninstall-local): Remove installed .egg folders. -- Python 3.9+ install the module into a gpg-*.egg folder instead of in "gpg" with accompanying gpg-*.egg-info file. Moreover, Python 3.9+ normalize version numbers, e.g. the version 1.24.0_beta576 is normalized as 1.24.0b576. --- lang/python/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am index 84b39c53..a6fd6396 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -101,8 +101,12 @@ install-exec-local: done uninstall-local: - set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \ + set -x; \ + GV=$$(echo $(VERSION) | tr - _); \ + normalizedGV=$$(echo $$GV | sed s/_beta/b/); \ + for PYTHON in $(PYTHONS); do \ PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \ - "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \ + "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info \ + "$(DESTDIR)$${PLATLIB}"/gpg-$$normalizedGV-py*.egg ; \ done