From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 11 Sep 2009 12:26:17 +0000 (+0200)
Subject: Modify tools to be able to correctly install testls for regress
X-Git-Tag: Release-5.0.0~316^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c2bd4c8aedc8780337d16d7bddf9f3b1ba5f3c5;p=bacula%2Fbacula

Modify tools to be able to correctly install testls for regress
---

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}