Fix tray-monitor installation

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index af957e9d6c90d92aeee7a29b0d318f98e305ff80..10fb7e7f9a760af4232206e42a4a0df560ddb757 100755 (executable)
--- 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 97003261e1b2b9bf06da963e45b29cbbc563bfae..ea86a804d79874cd2b49180ce11459f6820108c6 100644 (file)
--- 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 395f3029906464401fb77bccf0d3cd65e74f9034..534ce0c8424714ccc648e4b3e4a9e5b24471e1e7 100644 (file)
--- 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