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 d7b3139e8690b98d64dcebee2d3ebf7222225789..a7a4156d2994f7e5922acf1501961c7464bb61b7 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -134,6 +134,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 6013db2fcaf0f81c24ecca55c6fa55e6563f18e3..8ae6a171cb148dab96553fed4c8592e7ab1a6430 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -52,7 +52,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}