From 33b0c8a3e0997cef88a8c3d34215acbea2721c1d Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Wed, 18 Jun 2014 17:48:54 +0200 Subject: [PATCH] use bindir instead of sbindir for non system tools moved bat, bareos-tray-monitor, bconsole, bwild and bregex from sbin to bin directory. Also moved there man pages from section 8 to 1. Fixes a bug for building qt-console and qt-tray-monitor (library ordering), so that they can be compiled, even if an older version of Bareos is installed. Signed-off-by: Marco van Wieringen --- Makefile.in | 6 ++--- autoconf/Make.common.in | 3 +++ autoconf/configure.in | 11 ++++++++- debian/bareos-bat.install | 2 +- debian/bareos-bconsole.install | 3 ++- debian/bareos-common.install | 1 + debian/bareos-tools.install | 6 +++-- debian/bareos-traymonitor.install | 2 +- manpages/Makefile.in | 20 ++++++++-------- manpages/{bconsole.8 => bconsole.1} | 0 manpages/{bregex.8 => bregex.1} | 0 manpages/{bwild.8 => bwild.1} | 0 platforms/debian/Makefile.in | 24 ++++++++++++++----- platforms/packaging/bareos.spec | 16 ++++++++----- platforms/suse/Makefile.in | 6 ++--- src/console/Makefile.in | 5 +++- src/qt-console/bat.desktop.in | 4 ++-- src/qt-console/bat.pro.in | 13 +++++----- .../bareos-tray-monitor.desktop.in | 2 +- src/qt-tray-monitor/tray-monitor.pro.in | 5 ++-- src/tools/Makefile.in | 22 +++++++++++++---- 21 files changed, 99 insertions(+), 52 deletions(-) rename manpages/{bconsole.8 => bconsole.1} (100%) rename manpages/{bregex.8 => bregex.1} (100%) rename manpages/{bwild.8 => bwild.1} (100%) diff --git a/Makefile.in b/Makefile.in index 6c18be2a79c..d71482d7e3a 100755 --- a/Makefile.in +++ b/Makefile.in @@ -137,9 +137,7 @@ Makefile: Makefile.in Makefiles: $(SHELL) config.status (cd scripts; \ - chmod 755 startmysql stopmysql bareos startit stopit btraceback; \ - chmod 755 mtx-changer bconsole gconsole devel_bareos; \ - chmod 755 dvd-handler) + chmod 755 bareos btraceback mtx-changer bconsole devel_bareos; ) (cd src/cats; \ chmod 755 create_bareos_database update_bareos_tables make_bareos_tables; \ @@ -153,7 +151,7 @@ Makefiles: done (cd src/qt-console; \ - chmod 755 install_conf_file build-depkgs-qt-console) + chmod 755 install_conf_file) clean: @for I in ${all_subdirs} ; \ diff --git a/autoconf/Make.common.in b/autoconf/Make.common.in index c2c389d762e..5ee5e3d4590 100644 --- a/autoconf/Make.common.in +++ b/autoconf/Make.common.in @@ -25,6 +25,7 @@ binprefix = manprefix = datarootdir = @datarootdir@ docdir = @docdir@ +bindir = @bindir@ sbindir = @sbindir@ libdir = @libdir@ logdir = @logdir@ @@ -46,6 +47,8 @@ MV = @MV@ RM = @REMOVE@ RMF = $(RM) -f CP = @CP@ +LN_S = @LN_S@ +SYMLINK = $(LN_S) -f SED = @SED@ AWK = @AWK@ ECHOCMD = @ECHOCMD@ diff --git a/autoconf/configure.in b/autoconf/configure.in index 2d915aa6887..3c8b2ed19d6 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -309,6 +309,14 @@ AC_DEFINE_UNQUOTED(LIBDIR, "$libdir", [Where are shared libs stored]) AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir", [Where are config files stored]) AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", [Where are locale files stored]) +dnl ------------------------------------------------------------------ +dnl If the user has not set --bindir, we set our default as /bin +dnl ------------------------------------------------------------------ +if test x$bindir = x'${exec_prefix}/bin' ; then + bindir=${exec_prefix}/bin +fi +bindir=`eval echo ${bindir}` + dnl ------------------------------------------------------------------ dnl If the user has not set --sbindir, we set our default as /sbin dnl ------------------------------------------------------------------ @@ -4187,7 +4195,8 @@ Configuration on `date`: Bareos version: ${BAREOS} ${VERSION} (${DATE}) Distribution: ${DISTNAME} Source code location: ${srcdir} - Install binaries: ${sbindir} + Install binaries: ${bindir} + Install system binaries: ${sbindir} Install libraries: ${libdir} Install config files: ${sysconfdir} Scripts directory: ${scriptdir} diff --git a/debian/bareos-bat.install b/debian/bareos-bat.install index 65be4deb42d..a58479d4d73 100644 --- a/debian/bareos-bat.install +++ b/debian/bareos-bat.install @@ -1,6 +1,6 @@ #%attr(-, root, %{daemon_group}) %{_sbindir}/bat #%attr(640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bat.conf -/usr/sbin/bat +/usr/bin/bat /etc/bareos/bat.conf /usr/share/pixmaps/bat.png /usr/share/pixmaps/bat.svg diff --git a/debian/bareos-bconsole.install b/debian/bareos-bconsole.install index ef812aa3c51..975f1a67ec2 100644 --- a/debian/bareos-bconsole.install +++ b/debian/bareos-bconsole.install @@ -1,4 +1,5 @@ /etc/bareos/bconsole.conf /usr/lib/bareos/scripts/bconsole +/usr/bin/bconsole /usr/sbin/bconsole -/usr/share/man/man8/bconsole.8.gz +/usr/share/man/man1/bconsole.1.gz diff --git a/debian/bareos-common.install b/debian/bareos-common.install index f6619b879b9..932d897ae94 100644 --- a/debian/bareos-common.install +++ b/debian/bareos-common.install @@ -12,6 +12,7 @@ /usr/lib/libbareoslmdb-*.so /usr/lib/libbareosndmp.so /usr/lib/libbareosndmp-*.so +/usr/bin/bsmtp /usr/sbin/bsmtp /usr/sbin/btraceback /usr/share/man/man1/bsmtp.1.gz diff --git a/debian/bareos-tools.install b/debian/bareos-tools.install index 673788ed514..44e616507c8 100644 --- a/debian/bareos-tools.install +++ b/debian/bareos-tools.install @@ -1,12 +1,14 @@ +/usr/bin/bregex +/usr/bin/bwild /usr/sbin/bcopy /usr/sbin/bextract /usr/sbin/bls /usr/sbin/bregex /usr/sbin/bwild /usr/sbin/bpluginfo +/usr/share/man/man1/bwild.1.gz +/usr/share/man/man1/bregex.1.gz /usr/share/man/man8/bcopy.8.gz /usr/share/man/man8/bextract.8.gz /usr/share/man/man8/bls.8.gz -/usr/share/man/man8/bwild.8.gz -/usr/share/man/man8/bregex.8.gz /usr/share/man/man8/bpluginfo.8.gz diff --git a/debian/bareos-traymonitor.install b/debian/bareos-traymonitor.install index 0582a261faf..ba4f89d24ae 100644 --- a/debian/bareos-traymonitor.install +++ b/debian/bareos-traymonitor.install @@ -1,6 +1,6 @@ /etc/bareos/tray-monitor.conf /etc/xdg/autostart/bareos-tray-monitor.desktop -/usr/sbin/bareos-tray-monitor +/usr/bin/bareos-tray-monitor /usr/share/man/man1/bareos-tray-monitor.1.gz /usr/share/applications/bareos-tray-monitor.desktop /usr/share/pixmaps/bareos-tray-monitor.xpm diff --git a/manpages/Makefile.in b/manpages/Makefile.in index 4ae6c127d6a..c26b2414931 100644 --- a/manpages/Makefile.in +++ b/manpages/Makefile.in @@ -4,13 +4,13 @@ .PHONY: dummy +MAN1 = bareos-tray-monitor.1 bat.1 bconsole.1 bsmtp.1 bwild.1 bregex.1 + MAN8 = bareos.8 bareos-dir.8 bareos-fd.8 bareos-sd.8 \ - bconsole.8 bcopy.8 bareos-dbcheck.8 bextract.8 bls.8 bscan.8 btape.8 \ - btraceback.8 bwild.8 bregex.8 bpluginfo.8 \ + bcopy.8 bareos-dbcheck.8 bextract.8 bls.8 bscan.8 btape.8 \ + btraceback.8 bpluginfo.8 \ bscrypto.8 -MAN1 = bareos-tray-monitor.1 bat.1 bsmtp.1 - all: nothing: @@ -18,18 +18,18 @@ nothing: depend: install: - $(MKDIR) $(DESTDIR)/$(mandir)/man8 - for I in ${MAN8}; \ - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ - rm -f $$I.gz); \ - done $(MKDIR) $(DESTDIR)/$(mandir)/man1 for I in ${MAN1}; \ do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \ rm -f $$I.gz); \ done + $(MKDIR) $(DESTDIR)/$(mandir)/man8 + for I in ${MAN8}; \ + do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ + $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ + rm -f $$I.gz); \ + done clean: @$(RMF) *~ 1 2 3 *.bak diff --git a/manpages/bconsole.8 b/manpages/bconsole.1 similarity index 100% rename from manpages/bconsole.8 rename to manpages/bconsole.1 diff --git a/manpages/bregex.8 b/manpages/bregex.1 similarity index 100% rename from manpages/bregex.8 rename to manpages/bregex.1 diff --git a/manpages/bwild.8 b/manpages/bwild.1 similarity index 100% rename from manpages/bwild.8 rename to manpages/bwild.1 diff --git a/platforms/debian/Makefile.in b/platforms/debian/Makefile.in index a855bfc33ee..dfe175fcd44 100644 --- a/platforms/debian/Makefile.in +++ b/platforms/debian/Makefile.in @@ -49,15 +49,27 @@ install-dbconfig: @echo "Installing dbconfig files ..." @$(INSTALL_PROGRAM) set_dbconfig_vars.sh $(DESTDIR)/${scriptdir}/ @$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/ - @ln -s $(scriptdir)/ddl/creates/mysql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/mysql - @ln -s $(scriptdir)/ddl/creates/postgresql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/pgsql - @ln -s $(scriptdir)/ddl/creates/sqlite3.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3 + @$(SYMLINK) $(scriptdir)/ddl/creates/mysql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/mysql + @$(SYMLINK) $(scriptdir)/ddl/creates/postgresql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/pgsql + @$(SYMLINK) $(scriptdir)/ddl/creates/sqlite3.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3 @$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/ - for i in $(DESTDIR)/$(scriptdir)/ddl/updates/mysql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/mysql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/$$VERSION; done + for i in $(DESTDIR)/$(scriptdir)/ddl/updates/mysql.*.sql; do \ + BASENAME=`basename $$i`; \ + VERSION=`echo $$BASENAME | sed -r 's/mysql\.[0-9]*_([0-9]*)\.sql/\1/'`; \ + $(SYMLINK) $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/$$VERSION; \ + done @$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/ - for i in $(DESTDIR)/$(scriptdir)/ddl/updates/postgresql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/postgresql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/$$VERSION; done + for i in $(DESTDIR)/$(scriptdir)/ddl/updates/postgresql.*.sql; do \ + BASENAME=`basename $$i`; \ + VERSION=`echo $$BASENAME | sed -r 's/postgresql\.[0-9]*_([0-9]*)\.sql/\1/'`; \ + $(SYMLINK) $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/$$VERSION; \ + done @$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/ - for i in $(DESTDIR)/$(scriptdir)/ddl/updates/sqlite3.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/sqlite3\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/$$VERSION; done + for i in $(DESTDIR)/$(scriptdir)/ddl/updates/sqlite3.*.sql; do \ + BASENAME=`basename $$i`; \ + VERSION=`echo $$BASENAME | sed -r 's/sqlite3\.[0-9]*_([0-9]*)\.sql/\1/'`; \ + $(SYMLINK) $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/$$VERSION; \ + done clean: @$(RMF) 1 2 3 diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec index ad9bf69cbd3..be11d08f4b0 100644 --- a/platforms/packaging/bareos.spec +++ b/platforms/packaging/bareos.spec @@ -10,7 +10,7 @@ # * single-dir-install is not supported # * Single packages for: # * console package -# * dir package ( bsmtp ) +# * dir package # * sd package ( bls + btape + bcopy + bextract ) # * fd package ( ) # * tray monitor @@ -641,8 +641,9 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %defattr(-, root, root) %attr(0640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bconsole.conf %{script_dir}/bconsole +%{_bindir}/bconsole %{_sbindir}/bconsole -%{_mandir}/man8/bconsole.8.gz +%{_mandir}/man1/bconsole.1.gz %files director # dir package (bareos-dir, bsmtp) @@ -760,6 +761,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %dir %{_libdir}/bareos/ %endif %dir %{plugin_dir} +%{_bindir}/bsmtp %{_sbindir}/bsmtp %{_sbindir}/btraceback %{_mandir}/man1/bsmtp.1.gz @@ -823,17 +825,19 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %files tools # tools without link to db libs (bwild, bregex) %defattr(-, root, root) +%{_bindir}/bregex +%{_bindir}/bwild %{_sbindir}/bcopy %{_sbindir}/bextract %{_sbindir}/bls %{_sbindir}/bregex %{_sbindir}/bwild %{_sbindir}/bpluginfo +%{_mandir}/man1/bwild.1.gz +%{_mandir}/man1/bregex.1.gz %{_mandir}/man8/bcopy.8.gz %{_mandir}/man8/bextract.8.gz %{_mandir}/man8/bls.8.gz -%{_mandir}/man8/bwild.8.gz -%{_mandir}/man8/bregex.8.gz %{_mandir}/man8/bpluginfo.8.gz %if 0%{?build_qt_monitor} @@ -841,7 +845,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %defattr(-,root, root) %attr(-, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/tray-monitor.conf %config %{_sysconfdir}/xdg/autostart/bareos-tray-monitor.desktop -%{_sbindir}/bareos-tray-monitor +%{_bindir}/bareos-tray-monitor %{_mandir}/man1/bareos-tray-monitor.1.gz /usr/share/applications/bareos-tray-monitor.desktop /usr/share/pixmaps/bareos-tray-monitor.xpm @@ -850,7 +854,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %if 0%{?build_bat} %files bat %defattr(-, root, root) -%attr(-, root, %{daemon_group}) %{_sbindir}/bat +%attr(-, root, %{daemon_group}) %{_bindir}/bat %attr(640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bat.conf %{_prefix}/share/pixmaps/bat.png %{_prefix}/share/pixmaps/bat.svg diff --git a/platforms/suse/Makefile.in b/platforms/suse/Makefile.in index 89eb8d4b7d0..ef2075353ba 100644 --- a/platforms/suse/Makefile.in +++ b/platforms/suse/Makefile.in @@ -39,7 +39,7 @@ install-autostart-fd: fi @$(MKDIR) $(DESTDIR)/etc/init.d @$(INSTALL_PROGRAM) bareos-fd $(DESTDIR)/etc/init.d/bareos-fd - @ln -s ../../etc/init.d/bareos-fd $(DESTDIR)$(sbindir)/rcbareos-fd + @$(SYMLINK) ../../etc/init.d/bareos-fd $(DESTDIR)$(sbindir)/rcbareos-fd # set symlinks for script at startup and shutdown @if test x$(DESTDIR) = x ; then \ /sbin/chkconfig --add bareos-fd; \ @@ -51,7 +51,7 @@ install-autostart-sd: fi @$(MKDIR) $(DESTDIR)/etc/init.d @$(INSTALL_PROGRAM) bareos-sd $(DESTDIR)/etc/init.d/bareos-sd - @ln -s ../../etc/init.d/bareos-sd $(DESTDIR)$(sbindir)/rcbareos-sd + @$(SYMLINK) ../../etc/init.d/bareos-sd $(DESTDIR)$(sbindir)/rcbareos-sd # set symlinks for script at startup and shutdown @if test x$(DESTDIR) = x ; then \ /sbin/chkconfig --add bareos-sd; \ @@ -63,7 +63,7 @@ install-autostart-dir: fi @$(MKDIR) $(DESTDIR)/etc/init.d @$(INSTALL_PROGRAM) bareos-dir $(DESTDIR)/etc/init.d/bareos-dir - @ln -s ../../etc/init.d/bareos-dir $(DESTDIR)$(sbindir)/rcbareos-dir + @$(SYMLINK) ../../etc/init.d/bareos-dir $(DESTDIR)$(sbindir)/rcbareos-dir # set symlinks for script at startup and shutdown @if test x$(DESTDIR) = x ; then \ /sbin/chkconfig --add bareos-dir; \ diff --git a/src/console/Makefile.in b/src/console/Makefile.in index 850ab57533d..040c1c79f1a 100644 --- a/src/console/Makefile.in +++ b/src/console/Makefile.in @@ -86,7 +86,10 @@ install: all echo " is no longer used, and you might want to delete it."; \ echo " "; \ fi - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole + $(MKDIR) $(DESTDIR)$(bindir) + $(MKDIR) $(DESTDIR)$(sbindir) + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole; + @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi @srcconf=bconsole.conf; \ if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ destconf=$$srcconf.new; \ diff --git a/src/qt-console/bat.desktop.in b/src/qt-console/bat.desktop.in index db2b932cb15..3a02e54c1d8 100644 --- a/src/qt-console/bat.desktop.in +++ b/src/qt-console/bat.desktop.in @@ -3,8 +3,8 @@ Name=Bareos Administration Tool GenericName=Backup Administration Tool Comment=Bareos Administration Tool Icon=bat -TryExec=@sbindir@/bat -Exec=@sbindir@/bat -c @sysconfdir@/bat.conf +TryExec=@bindir@/bat +Exec=@bindir@/bat -c @sysconfdir@/bat.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/src/qt-console/bat.pro.in b/src/qt-console/bat.pro.in index 830de05acc6..4ed4d299b5d 100644 --- a/src/qt-console/bat.pro.in +++ b/src/qt-console/bat.pro.in @@ -15,7 +15,7 @@ CONFIG( debug, debug|release ) { CONFIG += release } -bins.path = /$(DESTDIR)@sbindir@ +bins.path = /$(DESTDIR)@bindir@ bins.files = bat confs.path = /$(DESTDIR)@sysconfdir@ confs.commands = ./install_conf_file @@ -27,11 +27,12 @@ desktopentries.path = /$(DESTDIR)@datarootdir@/applications/ desktopentries.files = bat.desktop -TEMPLATE = app -TARGET = bat -DEPENDPATH += . -INCLUDEPATH += .. ../include . -LIBS += -L../lib -lbareoscfg -lbareos +TEMPLATE = app +TARGET = bat +DEPENDPATH += . +INCLUDEPATH += .. ../include . +QMAKE_LIBDIR += ../lib +LIBS += -lbareoscfg -lbareos LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) diff --git a/src/qt-tray-monitor/bareos-tray-monitor.desktop.in b/src/qt-tray-monitor/bareos-tray-monitor.desktop.in index 850d21e0dfa..6b7b92e6017 100644 --- a/src/qt-tray-monitor/bareos-tray-monitor.desktop.in +++ b/src/qt-tray-monitor/bareos-tray-monitor.desktop.in @@ -4,7 +4,7 @@ Name=Bareos Tray Monitor GenericName=Backup Tray Monitor Comment=Notification Tray Monitor Icon=bareos-tray-monitor -Exec=@sbindir@/bareos-tray-monitor -c @sysconfdir@/tray-monitor.conf +Exec=@bindir@/bareos-tray-monitor -c @sysconfdir@/tray-monitor.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/src/qt-tray-monitor/tray-monitor.pro.in b/src/qt-tray-monitor/tray-monitor.pro.in index 020f82074f6..a4c68d9e725 100644 --- a/src/qt-tray-monitor/tray-monitor.pro.in +++ b/src/qt-tray-monitor/tray-monitor.pro.in @@ -15,9 +15,10 @@ CONFIG( debug, debug|release ) { CONFIG += release } -LIBS += -L../lib -lbareoscfg -lbareos +QMAKE_LIBDIR += ../lib +LIBS += -lbareoscfg -lbareos -bins.path = /$(DESTDIR)@sbindir@ +bins.path = /$(DESTDIR)@bindir@ bins.files = bareos-tray-monitor confs.path = /$(DESTDIR)@sysconfdir@ confs.files = tray-monitor.conf diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 83d04b2f1e8..2eaa9f7e7d8 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -26,7 +26,8 @@ OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@ GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ TOOLS = bsmtp drivetype fstype bregex bwild bpluginfo bscrypto timelimit -INSTOOLS = bsmtp bwild bregex bpluginfo bscrypto +TOOLS_BIN = bsmtp bwild bregex +TOOLS_SBIN = bpluginfo bscrypto INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include @@ -124,12 +125,23 @@ installall: $(TOOLS) done chmod 755 $(DESTDIR)$(sbindir)/bsmtp -# Allow non-root execution of bsmtp for non-root Directors -install: $(INSTOOLS) - @for tool in ${INSTOOLS} ; do \ +installbin: $(TOOLS_BIN) + $(MKDIR) $(DESTDIR)$(bindir) + $(MKDIR) $(DESTDIR)$(sbindir) + @for tool in ${TOOLS_BIN} ; do \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(bindir)/$$tool ; \ + if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) $(bindir)/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \ + done + # Allow non-root execution of bsmtp for non-root Directors + chmod 755 $(DESTDIR)$(bindir)/bsmtp + +installsbin: $(TOOLS_SBIN) + $(MKDIR) $(DESTDIR)$(sbindir) + @for tool in ${TOOLS_SBIN} ; do \ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \ done - chmod 755 $(DESTDIR)$(sbindir)/bsmtp + +install: installbin installsbin # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems