From ff6cffab926aa8be1b6a7b5fb6caf5019307110a Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 5 Jul 2024 14:23:30 +0200
Subject: [PATCH] speedo: Let install also copy the SO's symlinks.

* build-aux/speedo.mk (install-speedo): Also instal the sumlinks for
the SOs.
---
 README              | 8 ++++++--
 build-aux/speedo.mk | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 1bea40b7a..3e1e2793d 100644
--- a/README
+++ b/README
@@ -97,9 +97,13 @@
   example:
 
     make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26
-    ldconfig -n /usr/local/gnupg26/lib
 
-  and adding /usr/local/gnupg26/bin to PATH.
+  and run the binaries like
+
+    /usr/local/gnupg26/bin/gpg
+
+  which will also start any daemon from the same directory.  Make sure
+  to stop already running daemons or use a different GNUPGHOME.
 
 
 ** Specific build problems on some machines:
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 816aeca44..c4edb3547 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1110,9 +1110,8 @@ ifneq ($(TARGETOS),w32)
 	 echo "speedo: /*" ;\
 	 echo "speedo:  * Now copy $(idir)/ to the final location and" ;\
 	 echo "speedo:  * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\
-	 echo "speedo:  * Or run:" ;\
+	 echo "speedo:  * Or run run for example:" ;\
 	 echo "speedo:  *   make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26" ;\
-         echo "speedo:  *   ldconfig -n /usr/local/gnupg26/lib";\
 	 echo "speedo:  */")
 endif
 
@@ -1128,7 +1127,6 @@ 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/gnupg26";\
-           echo "speedo:   ldconfig -n /usr/local/gnupg26/lib";\
            exit 1;\
          fi;\
          if [ ! -d "$$SYSROOT"/bin ]; then if ! mkdir "$$SYSROOT"/bin; then \
@@ -1150,6 +1148,8 @@ ifneq ($(TARGETOS),w32)
          echo "speedo: Installing files to $$SYSROOT";\
          find . -type f -executable \
                 -exec install -Dm 755 "{}" "$$SYSROOT/{}" \; ;\
+         find . -type l -executable \
+                -exec install -Dm 755 "{}" "$$SYSROOT/{}" \; ;\
          find . -type f \! -executable \
                 -exec install -Dm 644 "{}" "$$SYSROOT/{}" \; ;\
 	 echo "sysconfdir = /etc/gnupg" > "$$SYSROOT"/bin/gpgconf.ctl ;\