bacula/bacula-install.patch
2020-03-05 11:45:51 +01:00

74 lines
3.0 KiB
Diff

diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-05 09:46:32.131750774 +0100
+++ bacula-9.6.2/autoconf/configure.in 2020-03-05 09:47:33.786041438 +0100
@@ -3498,11 +3498,11 @@
src/qt-console/bat.pro.mingw32 \
src/qt-console/bat.pro.mingw64 \
src/qt-console/install_conf_file \
- src/qt-console/tray-monitor/tray-monitor.conf \
src/qt-console/tray-monitor/bacula-tray-monitor.conf \
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 \
@@ -3609,6 +3609,8 @@
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 -Naur bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.2/examples/nagios/check_bacula/Makefile.in
--- bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:32.128750711 +0100
+++ bacula-9.6.2/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:40.145918546 +0100
@@ -72,7 +72,7 @@
(cd $(srcdir); $(RMF) Makefile)
install: all
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(sbindir)/check_bacula
uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
diff -Naur bacula-9.6.2.old/Makefile.in bacula-9.6.2/Makefile.in
--- bacula-9.6.2.old/Makefile.in 2020-03-05 09:46:32.135750858 +0100
+++ bacula-9.6.2/Makefile.in 2020-03-05 09:46:40.146918567 +0100
@@ -173,6 +173,8 @@
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 -Naur bacula-9.6.2.old/src/qt-console/bat.pro.in bacula-9.6.2/src/qt-console/bat.pro.in
--- bacula-9.6.2.old/src/qt-console/bat.pro.in 2020-03-05 09:46:32.163751446 +0100
+++ bacula-9.6.2/src/qt-console/bat.pro.in 2020-03-05 09:46:40.146918567 +0100
@@ -12,7 +12,7 @@
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
bins.path = /$(DESTDIR)@sbindir@
-bins.files = bat
+bins.files = .libs/bat
confs.path = /$(DESTDIR)@sysconfdir@
confs.commands = ./install_conf_file
help.path = /$(DESTDIR)@htmldir@
diff -Naur bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in
--- bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:32.166751509 +0100
+++ bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:40.146918567 +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