From 582f14d97a900106dce0c8d8666a443c6ec25050 Mon Sep 17 00:00:00 2001 From: Ben McGinnes Date: Thu, 4 Oct 2018 18:11:01 +1000 Subject: [PATCH] python: make file * lang/python/Makefile.am: Now that gpg2 has been renamed back to gpg and gpg1 is semi-deprecated, we should check what the actual gpg binary is with gpgconf and use that rather than make assumptions per system. * Also, it means less worry if gpg3 is ever a thing. (Trust me, I remember the Python 1 to 2 transition as well as the current 2 to 3 transition). ;) Signed-off-by: Ben McGinnes --- lang/python/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am index 391de827..9cdccb5a 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -59,7 +59,8 @@ python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp top_builddir="$(top_builddir)" \ $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \ --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST - gpg2 --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz + gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g' + $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz .PHONY: sdist sdist: python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc