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 5a9df7ca529da47989d4d99501dba2dba64da6b4..f744944e3ec1410d8d3f11c36875822c5fe948c6 100644 (file)
--- 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 fc8fc8d899bb659be8f90470bf8c4820c0cc1740..7d79fe21853d0834464df30c21dba892ac0336bd 100755 (executable)
--- 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}