From 2945160920fe167912cb218f392ab9dc475276dd Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Wed, 11 Sep 2024 14:18:51 +0200
Subject: [PATCH] Makefile.am: install-win-bundle-thirdparty DLL check: cover
 libexecdir [#1936 follow-up]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 Makefile.am | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index abf9c1ada2..351b3dca82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -549,7 +549,8 @@ if HAVE_WINDOWS
 # Then hardlink libraries for sbin... (alternative: all bins in one dir)
 # TOTHINK: Are there more dirs to consider? So far we cover bindir, sbindir and
 # driverexecdir (e.g. some Linux distros place drivers to /lib/nut while tools
-# and daemons are in /usr/bin and /usr/sbin), and cgiexecdir; anything else?..
+# and daemons are in /usr/bin and /usr/sbin), and cgiexecdir, and occasional
+# helpers like "sockdebug.exe" in libexecdir; anything else?..
 # Note we hold existance of cgiexecdir as optional, but the name is expected to
 # be defined. Other dirs are "just assumed" to exist (that we are not packaging
 # some NUT build without drivers/tools/daemons). Subject to change if needed.
@@ -575,7 +576,7 @@ install-win-bundle-thirdparty:
 	 (  cd '$(DESTDIR)' || exit ; \
 	    DESTDIR="" '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->bin   $$D" 2>&1 ; \
+	        echo "   DLL->bin       $$D" 2>&1 ; \
 	        cp -pf "$$D" './$(bindir)/' ; \
 	    done ; \
 	 ) || exit ; \
@@ -583,7 +584,7 @@ install-win-bundle-thirdparty:
 	    cd '$(DESTDIR)/$(sbindir)' || exit ; \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->sbin  $$D" 2>&1 ; \
+	        echo "   DLL->sbin      $$D" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename "$$D"`" ./ ; \
 	    done ; \
 	 ) || exit ; \
@@ -592,7 +593,7 @@ install-win-bundle-thirdparty:
 	    cd '$(DESTDIR)/$(driverexecdir)' || exit ; \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->drv   $$D" 2>&1 ; \
+	        echo "   DLL->drv       $$D" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename "$$D"`" ./ ; \
 	    done ; \
 	 ) || exit ; \
@@ -603,18 +604,30 @@ install-win-bundle-thirdparty:
 	    cd '$(DESTDIR)/$(cgiexecdir)' || exit ; \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->cgi   $$D" 2>&1 ; \
+	        echo "   DLL->cgi       $$D" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename "$$D"`" ./ ; \
 	    done ; \
 	 ) || exit
+	 (  if test x"$(libexecdir)" = x"$(bindir)" ; then exit 0 ; fi ; \
+	    if test x"$(libexecdir)" = x"$(sbindir)" ; then exit 0 ; fi ; \
+	    if test x"$(libexecdir)" = x"$(driverexecdir)" ; then exit 0 ; fi ; \
+	    if test x"$(libexecdir)" = x"$(cgiexecdir)" ; then exit 0 ; fi ; \
+	    cd '$(DESTDIR)/$(libexecdir)' || exit ; \
+	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
+	    | while read D ; do \
+	        echo "   DLL->libexec   $$D" 2>&1 ; \
+	        ln -f '$(DESTDIR)/$(bindir)'/"`basename "$$D"`" ./ ; \
+	    done ; \
+	 ) || exit ; \
 	@echo "CHECKING if any executable files were installed to locations other than those covered by this recipe, so might not have needed DLLs bundled near them" >&2 ; \
 	 relbindir="`echo './$(bindir)/' | sed 's,//*,/,g'`" ; \
 	 relsbindir="`echo './$(sbindir)/' | sed 's,//*,/,g'`" ; \
 	 reldriverexecdir="`echo './$(driverexecdir)/' | sed 's,//*,/,g'`" ; \
 	 relcgiexecdir="`echo './$(cgiexecdir)/' | sed 's,//*,/,g'`" ; \
+	 rellibexecdir="`echo './$(libexecdir)/' | sed 's,//*,/,g'`" ; \
 	 cd '$(DESTDIR)' || exit ; \
 	 find . -type f | grep -Ei '\.(exe|dll)$$' \
-	 | grep -vE "^($${relbindir}|$${relsbindir}|$${reldriverexecdir}|$${relcgiexecdir})" \
+	 | grep -vE "^($${relbindir}|$${relsbindir}|$${reldriverexecdir}|$${relcgiexecdir}|$${rellibexecdir})" \
 	 | ( RES=0 ; while IFS= read LINE ; do echo "$$LINE" ; RES=1; done; exit $$RES )
 
 else