BEE Backport bacula/src/dird/Makefile.in

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Jan 10 18:12:08 2020 +0100

    Rename BEE_XXX_YYY_SRCS into EXTRA_XXX_YYY_SRCS and add --disable-bee ./configure option

Author: Kern Sibbald <kern@sibbald.com>
Date:   Wed May 20 15:19:12 2015 +0200

    Fix Makefile.in tabs

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 488a88f0214f0646cbbca8f0e626d061615ced23..d492e8e018ae5be20da856e64991155769198fd2 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Bacula Director Makefile
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 @MCOMMON@
@@ -23,9 +23,9 @@ DEBUG=@DEBUG@
 
 GETTEXT_LIBS = @LIBINTL@
 CAP_LIBS = @CAP_LIBS@
-ZLIBS=@ZLIBS@
 DB_LIBS=@DB_LIBS@
 
+EXTRA_SRCS = @EXTRA_DIRD_SRCS@
 
 first_rule: all
 dummy:
@@ -44,7 +44,7 @@ SVRSRCS = dird.c admin.c authenticate.c \
          ua_input.c ua_label.c ua_output.c ua_prune.c \
          ua_purge.c ua_restore.c ua_run.c \
          ua_select.c ua_server.c snapshot.c \
-         ua_status.c ua_tree.c ua_update.c vbackup.c verify.c
+         ua_status.c ua_tree.c ua_update.c vbackup.c verify.c $(EXTRA_SRCS)
 SVROBJS = $(SVRSRCS:.c=.o)
 
 JSONOBJS = bdirjson.o dird_conf.o run_conf.o inc_conf.o ua_acl.o
@@ -69,14 +69,14 @@ bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libb
            ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
            ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) $(ZLIBS) \
+       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
              -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
              $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 
 static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
                   ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
                   ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) $(ZLIBS) \
+       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
              -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
              $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
        strip $@
@@ -113,7 +113,7 @@ install: all
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bdirjson $(DESTDIR)$(sbindir)/bdirjson
        @srcconf=bacula-dir.conf; \
-          if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+          if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
              destconf=$$srcconf.new; \
              echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
           else \
@@ -121,10 +121,10 @@ install: all
           fi; \
           echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
           ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-          @if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
+          @if test "x${dir_group}" != "x"; then \
              chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
           fi
-       @if test -f ${DESTDIR}${scriptdir}/query.sql; then \
+       @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
           $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
        fi