diff -Naur bacula-community-Release-13.0.4.old/bacula/autoconf/config.rpath bacula-community-Release-13.0.4/bacula/autoconf/config.rpath
--- bacula-community-Release-13.0.4.old/bacula/autoconf/config.rpath	2024-02-14 09:27:15.616148442 +0100
+++ bacula-community-Release-13.0.4/bacula/autoconf/config.rpath	2024-02-14 09:27:24.901306527 +0100
@@ -555,7 +555,7 @@
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+hardcode_libdir_flag_spec=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator="$hardcode_libdir_separator"
diff -Naur bacula-community-Release-13.0.4.old/bacula/examples/nagios/check_bacula/Makefile.in bacula-community-Release-13.0.4/bacula/examples/nagios/check_bacula/Makefile.in
--- bacula-community-Release-13.0.4.old/bacula/examples/nagios/check_bacula/Makefile.in	2024-02-14 09:27:15.648148987 +0100
+++ bacula-community-Release-13.0.4/bacula/examples/nagios/check_bacula/Makefile.in	2024-02-14 09:27:24.938307158 +0100
@@ -72,7 +72,8 @@
 	(cd $(srcdir); $(RMF) Makefile)
 
 install: all
-	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
+	$(MKDIR) $(DESTDIR)$(libdir)/nagios/plugins
+	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(libdir)/nagios/plugins/check_bacula
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
diff -Naur bacula-community-Release-13.0.4.old/bacula/scripts/logwatch/logfile.bacula.conf.in bacula-community-Release-13.0.4/bacula/scripts/logwatch/logfile.bacula.conf.in
--- bacula-community-Release-13.0.4.old/bacula/scripts/logwatch/logfile.bacula.conf.in	2024-02-14 09:27:15.683149583 +0100
+++ bacula-community-Release-13.0.4/bacula/scripts/logwatch/logfile.bacula.conf.in	2024-02-14 09:27:24.939307175 +0100
@@ -1,3 +1,3 @@
 # What actual file?  Defaults to LogPath if not absolute path....
-LogFile = @logdir@/bacula.log
+LogFile = @logdir@/*.log
 
diff -Naur bacula-community-Release-13.0.4.old/bacula/scripts/Makefile.in bacula-community-Release-13.0.4/bacula/scripts/Makefile.in
--- bacula-community-Release-13.0.4.old/bacula/scripts/Makefile.in	2024-02-14 09:27:15.680149531 +0100
+++ bacula-community-Release-13.0.4/bacula/scripts/Makefile.in	2024-02-14 09:27:24.941307209 +0100
@@ -67,7 +67,6 @@
 	   $(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \
 	fi
 	$(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport
-	$(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop
 	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
 		   $(DESTDIR)$(scriptdir)/btraceback.dbx \
 		   $(DESTDIR)$(scriptdir)/btraceback.mdb
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/cats/make_sqlite3_tables.in bacula-community-Release-13.0.4/bacula/src/cats/make_sqlite3_tables.in
--- bacula-community-Release-13.0.4.old/bacula/src/cats/make_sqlite3_tables.in	2024-02-14 09:27:15.687149651 +0100
+++ bacula-community-Release-13.0.4/bacula/src/cats/make_sqlite3_tables.in	2024-02-14 09:27:24.942307226 +0100
@@ -560,4 +560,5 @@
 echo ""
 
 chmod 640 ${db_name}.db
+chown bacula:bacula ${db_name}.db
 exit 0
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/dird/bacula-dir.conf.in bacula-community-Release-13.0.4/bacula/src/dird/bacula-dir.conf.in
--- bacula-community-Release-13.0.4.old/bacula/src/dird/bacula-dir.conf.in	2024-02-14 09:27:15.690149702 +0100
+++ bacula-community-Release-13.0.4/bacula/src/dird/bacula-dir.conf.in	2024-02-14 09:27:24.942307226 +0100
@@ -18,7 +18,7 @@
 Director {                            # define myself
   Name = @basename@-dir
   DIRport = @dir_port@                # where we listen for UA connections
-  QueryFile = "@scriptdir@/query.sql"
+  QueryFile = "@sysconfdir@/query.sql"
   WorkingDirectory = "@working_dir@"
   PidDirectory = "@piddir@"
   Maximum Concurrent Jobs = 20
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/dird/Makefile.in bacula-community-Release-13.0.4/bacula/src/dird/Makefile.in
--- bacula-community-Release-13.0.4.old/bacula/src/dird/Makefile.in	2024-02-14 09:27:15.689149685 +0100
+++ bacula-community-Release-13.0.4/bacula/src/dird/Makefile.in	2024-02-14 09:27:24.943307243 +0100
@@ -126,11 +126,11 @@
 	   @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}${sysconfdir}/query.sql; then \
 	   echo "  ==> Saving existing query.sql to query.sql.old"; \
-	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
+	   $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \
 	fi
-	${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
+	${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql
 	@if test -f static-bacula-dir; then \
 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
 	fi
@@ -139,7 +139,7 @@
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)
 	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
 
 
 
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/plugins/fd/docker/Makefile bacula-community-Release-13.0.4/bacula/src/plugins/fd/docker/Makefile
--- bacula-community-Release-13.0.4.old/bacula/src/plugins/fd/docker/Makefile	2024-02-14 09:27:15.713150093 +0100
+++ bacula-community-Release-13.0.4/bacula/src/plugins/fd/docker/Makefile	2024-02-14 09:27:24.943307243 +0100
@@ -25,11 +25,11 @@
 
 .c.lo:
 	@echo "Compiling $< ..."
-	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $<
+	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(working_dir)\" -c $<
 
 %.lo: %.c %.h
 	@echo "Pattern compiling $< ..."
-	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $(@:.lo=.c)
+	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(working_dir)\" -c $(@:.lo=.c)
 
 docker-fd.la: Makefile $(DOCKEROBJ) $(PLUGINLIBDIR)/pluginlib.lo $(DOCKERSRCH)
 	@echo "Linking $(@:.la=.so) ..."
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/qt-console/bat.pro.in bacula-community-Release-13.0.4/bacula/src/qt-console/bat.pro.in
--- bacula-community-Release-13.0.4.old/bacula/src/qt-console/bat.pro.in	2024-02-14 09:27:15.723150264 +0100
+++ bacula-community-Release-13.0.4/bacula/src/qt-console/bat.pro.in	2024-02-14 09:27:24.943307243 +0100
@@ -12,10 +12,10 @@
 
 datarootdir = @datarootdir@
 bins.path = /$(DESTDIR)@sbindir@
-bins.files = bat
+bins.files = .libs/bat
 confs.path = /$(DESTDIR)@sysconfdir@
 confs.commands = ./install_conf_file
-help.path = /$(DESTDIR)@docdir@
+help.path = /$(DESTDIR)@htmldir@
 help.files = help/*.html images/status.png images/mail-message-new.png
 
 TEMPLATE     = app
diff -Naur bacula-community-Release-13.0.4.old/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-community-Release-13.0.4/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in
--- bacula-community-Release-13.0.4.old/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in	2024-02-14 09:27:15.740150553 +0100
+++ bacula-community-Release-13.0.4/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in	2024-02-14 09:27:24.944307261 +0100
@@ -26,7 +26,7 @@
 
 
 bins.path = /$(DESTDIR)@sbindir@
-bins.files = bacula-tray-monitor
+bins.files = .libs/bacula-tray-monitor
 confs.path = /$(DESTDIR)@sysconfdir@
 confs.commands = ./install_conf_file