From 878d9ac5fe45554418a8c770a3e78d70c0bf6266 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 11 Sep 2009 14:26:17 +0200
Subject: [PATCH] Modify tools to be able to correctly install testls for
 regress

---
 bacula/src/tools/Makefile.in | 6 ++++++
 regress/scripts/setup        | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index 5a9df7ca52..f744944e3e 100644
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -138,6 +138,12 @@ devclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
 	(cd $(srcdir); $(RMF) Makefile)
 
+installall:  $(TOOLS)
+	@for tool in ${TOOLS} ; do \
+	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \
+	done
+	chmod 755 $(DESTDIR)$(sbindir)/bsmtp
+
 # Allow non-root execution of bsmtp for non-root Directors
 install: $(INSTOOLS)
 	@for tool in ${INSTOOLS} ; do \
diff --git a/regress/scripts/setup b/regress/scripts/setup
index fc8fc8d899..7d79fe2185 100755
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -53,7 +53,9 @@ check_exit_code
 # eliminate non-essential directories to reduce
 #   size.  Otherwise regress run too long
 rm -rf src/win32 examples patches
-cp src/tools/testls ../bin
+# get all tools -- especially testls
+cd src/tools
+make installall
 check_exit_code
 
 cd ${cwd}
-- 
2.39.5