From b7c15948610b8c0a94f978860ba8123082f5836e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 23 Jan 2024 09:04:10 +0100
Subject: [PATCH] speedo: Minor fix to the install target

--
---
 README              |  4 ++--
 build-aux/speedo.mk | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 13205c275..b979234ce 100644
--- a/README
+++ b/README
@@ -93,9 +93,9 @@
   libraries can be installed into an arbitrary location using for
   example:
 
-    make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg-foo
+    make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24
 
-  and adding the directory to PATH.
+  and adding /usr/local/gnupg24/bin to PATH.
 
 
 ** Specific build problems on some machines:
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index be400c37a..335594b51 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1125,13 +1125,13 @@ ifneq ($(TARGETOS),w32)
              fi; \
            done; \
          done; \
-	 echo "sysconfdir = /etc"  >bin/gpgconf.ctl ;\
+	 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:" ;\
-	 echo "speedo:  *   make -f build-aux/speedo.mk install SYSROOT=/somewhere" ;\
+	 echo "speedo:  *   make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24" ;\
 	 echo "speedo:  */")
 endif
 
@@ -1146,7 +1146,7 @@ ifneq ($(TARGETOS),w32)
            echo "speedo: ERROR: SYSROOT has not been given";\
            echo "speedo: Set SYSROOT to the desired install directory";\
 	   echo "speedo: Example:";\
-           echo "speedo:   make -f build-aux/speedo.mk install SYSROOT=/usr/local";\
+           echo "speedo:   make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24";\
            exit 1;\
          fi;\
          if [ ! -d "$$SYSROOT"/bin ]; then if ! mkdir "$$SYSROOT"/bin; then \
@@ -1170,8 +1170,8 @@ ifneq ($(TARGETOS),w32)
                 -exec install -Dm 755 "{}" "$$SYSROOT/{}" \; ;\
          find . -type f \! -executable \
                 -exec install -Dm 644 "{}" "$$SYSROOT/{}" \; ;\
-	 echo "sysconfdir = /etc"    > "$$SYSROOT"/bin/gpgconf.ctl ;\
-	 echo "rootdir = $$SYSROOT" >> "$$SYSROOT"/bin/gpgconf.ctl ;\
+	 echo "sysconfdir = /etc/gnupg" > "$$SYSROOT"/bin/gpgconf.ctl ;\
+	 echo "rootdir = $$SYSROOT"    >> "$$SYSROOT"/bin/gpgconf.ctl ;\
          echo '/*' ;\
          echo " * Installation to $$SYSROOT done" ;\
 	 echo ' */' )