diff --git a/README b/README index b979234ce..a1e989356 100644 --- a/README +++ b/README @@ -94,6 +94,7 @@ example: make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24 + ldconfig -n /usr/local/gnupg24/lib and adding /usr/local/gnupg24/bin to PATH. diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 335594b51..00244fa8e 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -1132,6 +1132,7 @@ ifneq ($(TARGETOS),w32) echo "speedo: * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\ echo "speedo: * Or run:" ;\ echo "speedo: * make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24" ;\ + echo "speedo: * ldconfig -n /usr/local/gnupg24/lib";\ echo "speedo: */") endif @@ -1147,6 +1148,7 @@ ifneq ($(TARGETOS),w32) echo "speedo: Set SYSROOT to the desired install directory";\ echo "speedo: Example:";\ echo "speedo: make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24";\ + echo "speedo: ldconfig -n /usr/local/gnupg24/lib";\ exit 1;\ fi;\ if [ ! -d "$$SYSROOT"/bin ]; then if ! mkdir "$$SYSROOT"/bin; then \ diff --git a/g10/keyedit.c b/g10/keyedit.c index cae0f7841..e56e6d10b 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3336,7 +3336,7 @@ keyedit_quick_addadsk (ctrl_t ctrl, const char *fpr, const char *adskfpr) /* Unattended expiration setting function for the main key. If * SUBKEYFPRS is not NULL and SUBKEYSFPRS[0] is neither NULL, it is * expected to be an array of fingerprints for subkeys to change. It - * may also be an array which just one item "*" to indicate that all + * may also be an array with only the item "*" to indicate that all * keys shall be set to that expiration date. */ void