From: Carsten Leonhardt <leo@debian.org>
Date: Tue, 2 Jun 2020 16:29:39 +0000 (+0200)
Subject: Fix tray-monitor installation
X-Git-Tag: Release-9.6.4~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b11cd254985add5efe2c51369f52af9bd8cca3;p=thirdparty%2Fbacula.git

Fix tray-monitor installation
---

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index af957e9d6..10fb7e7f9 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -173,6 +173,8 @@ Makefiles:
 	  done
 	(cd src/qt-console; \
 	 chmod 755 install_conf_file build-depkgs-qt-console)
+	(cd src/qt-console/tray-monitor; \
+	 chmod 755 install_conf_file build-depkgs-qt-console)
 
 clean:
 	@for I in ${all_subdirs} ; \
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 97003261e..ea86a804d 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -3508,6 +3508,7 @@ AC_CONFIG_FILES([
    src/qt-console/tray-monitor/tray-monitor.pro \
    src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
    src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
+   src/qt-console/tray-monitor/install_conf_file \
    src/dird/Makefile \
    src/dird/bacula-dir.conf \
    src/lib/Makefile \
@@ -3614,6 +3615,8 @@ fi
 
 cd src/qt-console
 chmod 755 install_conf_file build-depkgs-qt-console
+cd tray-monitor
+chmod 755 install_conf_file build-depkgs-qt-console
 cd ${BUILD_DIR}
 
 cd scripts
diff --git a/bacula/scripts/bacula-tray-monitor.desktop.in b/bacula/scripts/bacula-tray-monitor.desktop.in
index 395f30299..534ce0c84 100644
--- a/bacula/scripts/bacula-tray-monitor.desktop.in
+++ b/bacula/scripts/bacula-tray-monitor.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Bacula Monitor
 Comment=Notification Tray Monitor
-Icon=/usr/share/pixmaps/bacula-tray-monitor.xpm
-Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/tray-monitor.conf
+Icon=bacula-tray-monitor
+Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/bacula-tray-monitor.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8