Add %D option to edit_job_code, simplify callbacks on director side

[bacula/bacula] / bacula / src / stored / Makefile.in

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index cf612a5369b1cb54010040a7eea03712037f2d72..bb5a9bbd466e2ed5b0cd6910f3c4766252190b69 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -18,6 +18,8 @@ DEBUG=@DEBUG@
 
 GETTEXT_LIBS = @LIBINTL@
 
+DB_LIBS=@DB_LIBS@
+
 first_rule: all
 dummy:
 
@@ -74,6 +76,7 @@ EXTRAOBJS = @OBJLIST@
 
 CAP_LIBS = @CAP_LIBS@
 ZLIBS=@ZLIBS@
+LZOLIBS = @LZOLIBS@
 
 
 .SUFFIXES:     .c .o
@@ -128,7 +131,7 @@ bextract.o: bextract.c
 
 bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        @echo "Compiling $<"
-       $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) \
+       $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
           -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c
@@ -170,8 +173,8 @@ install: all
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-       @if test "x$sd_group" != "x"; then \
-          chgrp -f $sd_group ${DESTDIR}${sysconfdir}/$$destconf \
+       @if test "x${sd_group}" != "x"; then \
+          chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \
        fi
        @if test -f static-bacula-sd; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \