aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen McGinnes <[email protected]>2018-10-04 08:11:01 +0000
committerBen McGinnes <[email protected]>2018-10-04 08:11:01 +0000
commit582f14d97a900106dce0c8d8666a443c6ec25050 (patch)
tree02467b65e63656afeb4fc3b5b2523fd3d06c1b4f
parentdocs: more whitespace checks (diff)
downloadgpgme-582f14d97a900106dce0c8d8666a443c6ec25050.tar.gz
gpgme-582f14d97a900106dce0c8d8666a443c6ec25050.zip
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 <[email protected]>
-rw-r--r--lang/python/Makefile.am3
1 files changed, 2 insertions, 1 deletions
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