diff options
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | build-aux/speedo.mk | 6 |
2 files changed, 10 insertions, 6 deletions
@@ -90,7 +90,11 @@ toolchain is installed. On a Debian based system it should be sufficient to run as root: - apt-get install build-essential libusb-1.0-0-dev libsqlite3-dev patchelf + apt-get install build-essential libusb-1.0-0-dev libsqlite3-dev \ + libldap-dev libreadline-dev patchelf + + (libldap-dev and libreadline-dev are not strictly necessary but + are highly suggested.) Then as regular user run @@ -229,8 +233,8 @@ systemctl --user mask --now gpg-agent.service \ gpg-agent.socket gpg-agent-ssh.socket \ gpg-agent-extra.socket gpg-agent-browser.socket - systemctl --user mask --now dirmngr.socket - systemctl --user mask --now keyboxd.socket + systemctl --user mask --now dirmngr.service dirmngr.socket + systemctl --user mask --now keyboxd.service keyboxd.socket This way all GnuPG components can handle the startup of their daemons on their own and start the correct version. diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index fcda05ab4..99736c2b8 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -1110,10 +1110,10 @@ ifneq ($(TARGETOS),w32) echo "sysconfdir = /etc/gnupg" >bin/gpgconf.ctl ;\ echo "rootdir = $(idir)" >>bin/gpgconf.ctl ;\ echo "speedo: /*" ;\ - echo "speedo: * Now copy $(idir)/ to the final location and" ;\ - echo "speedo: * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\ - echo "speedo: * Or run run for example:" ;\ + echo "speedo: * Now run for example:" ;\ echo "speedo: * make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26" ;\ + echo "speedo: * This copies copy $(idir)/ to the final location and" ;\ + echo "speedo: * adjusts $(idir)/bin/gpgconf.ctl accordingly" ;\ echo "speedo: */") endif |