store Bareos libraries in subdirectory bareos

Debian does not accept "libtool -release" libraries in /usr/lib/.
It will only accept "libtool -version" libraries
and only if the package is named accordingly to the library
(eg. libbareos).
Therefore Bareos libraries on Linux are now stored in
/usr/lib/bareos/ (or /usr/lib64/bareos/).

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>

Makefile.in

@@ -68,6 +68,7 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/config.h.in
 	cd $(srcdir);
 	${RMF} config.cache config.log config.out config.status src/config.h
 	${RMF} -r autoconf/autom4te.cache autom4te.cache
+	touch config.status
 	autoconf --prepend-include=$(srcdir)/autoconf \
 	autoconf/configure.in > configure
 	chmod 755 configure

autoconf/configure.in

@@ -3880,12 +3880,52 @@ osx)
    PFILES="${PFILES} \
       platforms/osx/Makefile"
   ;;
-debian)
+debian|ubuntu|univention)
    TAPEDRIVE="/dev/nst0"
    PSCMD="ps -e -o pid,command"
    PFILES="${PFILES} \
-    platforms/debian/Makefile \
-    platforms/debian/set_dbconfig_vars.sh"
+      debian/bareos-bat.install \
+      debian/bareos-bconsole.install \
+      debian/bareos-common.install \
+      debian/bareos-common.preinst \
+      debian/bareos-database-common.config \
+      debian/bareos-database-common.install \
+      debian/bareos-database-common.postinst \
+      debian/bareos-database-mysql.install \
+      debian/bareos-database-postgresql.install \
+      debian/bareos-database-sqlite3.install \
+      debian/bareos-database-tools.install \
+      debian/bareos-devel.install \
+      debian/bareos-director-python-plugin.install \
+      debian/bareos-director.bareos-dir.init \
+      debian/bareos-director.install \
+      debian/bareos-director.preinst \
+      debian/bareos-filedaemon-python-plugin.install \
+      debian/bareos-filedaemon.bareos-fd.init \
+      debian/bareos-filedaemon.install \
+      debian/bareos-filedaemon.preinst \
+      debian/bareos-storage-fifo.install \
+      debian/bareos-storage-python-plugin.install \
+      debian/bareos-storage-tape.install \
+      debian/bareos-storage.bareos-sd.init \
+      debian/bareos-storage.install \
+      debian/bareos-storage.preinst \
+      debian/bareos-tools.install \
+      debian/bareos-traymonitor.install \
+      platforms/debian/Makefile \
+      platforms/debian/set_dbconfig_vars.sh"
+   case "$DISTNAME" in
+      ubuntu)
+         PFILES="${PFILES} \
+            platforms/ubuntu/Makefile"
+         ;;
+      univention)
+         PFILES="${PFILES} \
+            debian/univention-bareos-schema.install \
+            debian/univention-bareos.install \
+            platforms/univention/Makefile"
+         ;;
+   esac
   ;;
 freebsd)
    VER=`echo $DISTVER | cut -c 1`
@@ -4031,22 +4071,6 @@ suse)
        platforms/suse/bareos-dir \
        platforms/suse/bareos"
   ;;
-ubuntu)
-   TAPEDRIVE="/dev/nst0"
-   PSCMD="ps -e -o pid,command"
-   PFILES="${PFILES} \
-    platforms/ubuntu/Makefile \
-    platforms/debian/Makefile \
-    platforms/debian/set_dbconfig_vars.sh"
-  ;;
-univention)
-   TAPEDRIVE="/dev/nst0"
-   PSCMD="ps -e -o pid,command"
-   PFILES="${PFILES} \
-     platforms/univention/Makefile \
-     platforms/debian/Makefile \
-     platforms/debian/set_dbconfig_vars.sh"
-  ;;
 unknown)
    TAPEDRIVE="/dev/nst0"
   ;;
@@ -4174,15 +4198,6 @@ AC_CONFIG_FILES([
 autoconf/Make.common \
 Makefile \
 manpages/Makefile \
-debian/bareos-common.preinst \
-debian/bareos-database-common.config \
-debian/bareos-database-common.postinst \
-debian/bareos-filedaemon.bareos-fd.init \
-debian/bareos-filedaemon.preinst \
-debian/bareos-director.bareos-dir.init \
-debian/bareos-director.preinst \
-debian/bareos-storage.bareos-sd.init \
-debian/bareos-storage.preinst \
 scripts/bareos-config \
 scripts/bareos-config-lib.sh \
 scripts/bareos-explorer \

debian/bareos-bat.install → debian/bareos-bat.install.in

@@ -1,5 +1,4 @@
-#%attr(-, root, %{daemon_group}) %{_sbindir}/bat
-#%attr(640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bat.conf
+/etc/bareos/bat.conf
 /usr/bin/bat
 /etc/bareos/bat.conf
 /usr/share/pixmaps/bat.png

debian/bareos-bconsole.install → debian/bareos-bconsole.install.in

@@ -1,5 +1,5 @@
 /etc/bareos/bconsole.conf
-/usr/lib/bareos/scripts/bconsole
+@scriptdir@/bconsole
 /usr/bin/bconsole
 /usr/sbin/bconsole
 /usr/share/man/man1/bconsole.1.gz

debian/bareos-common.install.in

@@ -0,0 +1,16 @@
+@libdir@/libbareos-[0-9]*.so
+@libdir@/libbareoscfg-[0-9]*.so
+@libdir@/libbareosfind-[0-9]*.so
+@libdir@/libbareoslmdb-[0-9]*.so
+@libdir@/libbareosndmp-[0-9]*.so
+@libdir@/libbareossd-[0-9]*.so
+@scriptdir@/bareos-config
+@scriptdir@/bareos-config-lib.sh
+@scriptdir@/bareos-explorer
+@scriptdir@/btraceback.gdb
+/usr/bin/bsmtp
+/usr/sbin/bsmtp
+/usr/sbin/btraceback
+/usr/share/man/man1/bsmtp.1.gz
+/usr/share/man/man8/btraceback.8.gz
+/var/lib/bareos/

debian/bareos-database-common.install.in

@@ -0,0 +1,10 @@
+@libdir@/libbareoscats-[0-9]*.so
+@libdir@/libbareossql-*.so
+@scriptdir@/create_bareos_database
+@scriptdir@/drop_bareos_database
+@scriptdir@/drop_bareos_tables
+@scriptdir@/grant_bareos_privileges
+@scriptdir@/make_bareos_tables
+@scriptdir@/set_dbconfig_vars.sh
+@scriptdir@/update_bareos_tables
+@scriptdir@/ddl/versions.map

debian/bareos-database-mysql.install → debian/bareos-database-mysql.install.in

@@ -1,4 +1,4 @@
-/usr/lib/bareos/backends/libbareoscats-mysql*.so
-/usr/lib/bareos/scripts/ddl/*/mysql*.sql
+@backenddir@/libbareoscats-mysql*.so
+@scriptdir@/ddl/*/mysql*.sql
 /usr/share/dbconfig-common/data/bareos-database-common/install/mysql
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/*

debian/bareos-database-postgresql.install → debian/bareos-database-postgresql.install.in

@@ -1,4 +1,4 @@
-/usr/lib/bareos/backends/libbareoscats-postgresql*.so
-/usr/lib/bareos/scripts/ddl/*/postgresql*.sql
+@backenddir@/libbareoscats-postgresql*.so
+@scriptdir@/ddl/*/postgresql*.sql
 /usr/share/dbconfig-common/data/bareos-database-common/install/pgsql
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/*

debian/bareos-database-sqlite3.install → debian/bareos-database-sqlite3.install.in

@@ -1,4 +1,4 @@
-/usr/lib/bareos/backends/libbareoscats-sqlite3*.so
-/usr/lib/bareos/scripts/ddl/*/sqlite3*.sql
+@backenddir@/libbareoscats-sqlite3*.so
+@scriptdir@/ddl/*/sqlite3*.sql
 /usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/*

debian/bareos-director-python-plugin.install.in

@@ -0,0 +1,3 @@
+@plugindir@/python-dir.so
+@plugindir@/bareos-dir.py*
+@plugindir@/bareos_dir_consts.py*

debian/bareos-director.install.in

@@ -0,0 +1,9 @@
+/etc/bareos/bareos-dir.conf
+/etc/logrotate.d/bareos-dir
+@scriptdir@/delete_catalog_backup
+@scriptdir@/make_catalog_backup
+@scriptdir@/make_catalog_backup.pl
+@scriptdir@/query.sql
+/usr/sbin/bareos-dir
+/usr/share/man/man8/bareos-dir.8.gz
+/usr/share/man/man8/bareos.8.gz

debian/bareos-filedaemon-python-plugin.install.in

@@ -0,0 +1,8 @@
+@plugindir@/python-fd.so
+@plugindir@/bareos-fd.py*
+@plugindir@/bareos-fd-local-fileset.py*
+@plugindir@/bareos-fd-mock-test.py*
+@plugindir@/BareosFdPluginBaseclass.py*
+@plugindir@/BareosFdPluginLocalFileset.py*
+@plugindir@/BareosFdWrapper.py*
+@plugindir@/bareos_fd_consts.py*

debian/bareos-storage-fifo.install.in

@@ -0,0 +1 @@
+@backenddir@/libbareossd-fifo*.so

debian/bareos-storage-python-plugin.install.in

@@ -0,0 +1,3 @@
+@plugindir@/python-sd.so
+@plugindir@/bareos-sd.py*
+@plugindir@/bareos_sd_consts.py*

debian/bareos-storage-tape.install.in

@@ -0,0 +1,7 @@
+/etc/bareos/mtx-changer.conf
+@backenddir@/libbareossd-gentape*.so
+@backenddir@/libbareossd-tape*.so
+@plugindir@/scsitapealert-sd.so
+@scriptdir@/mtx-changer
+/usr/share/man/man8/btape.8.gz
+/usr/sbin/btape

debian/bareos-storage.install → debian/bareos-storage.install.in

@@ -1,7 +1,7 @@
 /etc/bareos/bareos-sd.conf
 /usr/sbin/bscrypto
-/usr/lib/bareos/plugins/scsicrypto-sd.so
-/usr/lib/bareos/scripts/disk-changer
+@plugindir@/scsicrypto-sd.so
+@scriptdir@/disk-changer
 /usr/sbin/bareos-sd
 /usr/share/man/man8/bscrypto.8.gz
 /usr/share/man/man8/bareos-sd.8.gz

debian/rules

@@ -27,6 +27,7 @@ WORKING_DIR = /var/lib/bareos
 override_dh_auto_configure:
 	dh_auto_configure -- \
   --with-sbin-perm=755 \
+  --libdir=/usr/lib/bareos \
   --sysconfdir=/etc/bareos \
   --with-archivedir=/var/lib/bareos/storage \
   --with-backenddir=/usr/lib/bareos/backends \

platforms/packaging/bareos.spec

@@ -38,8 +38,9 @@ Vendor: 	The Bareos Team
 
 %define _libversion    14.2.0
 
-%define backend_dir    %_libdir/bareos/backends
-%define plugin_dir     %_libdir/bareos/plugins
+%define library_dir    %{_libdir}/bareos
+%define backend_dir    %{_libdir}/bareos/backends
+%define plugin_dir     %{_libdir}/bareos/plugins
 %define script_dir     /usr/lib/bareos/scripts
 %define working_dir    /var/lib/bareos
 %define pid_dir        /var/lib/bareos
@@ -507,6 +508,7 @@ export MTX=/usr/sbin/mtx
 # Notice keep the upstream order of ./configure --help
 %configure \
   --prefix=%{_prefix} \
+  --libdir=%{library_dir} \
   --sbindir=%{_sbindir} \
   --with-sbin-perm=755 \
   --sysconfdir=%{_sysconfdir}/bareos \
@@ -631,9 +633,8 @@ done
 
 # remove links to libraries
 # for i in #{buildroot}/#{_libdir}/libbareos*; do printf "$i: "; readelf -a $i | grep SONAME; done
-#find #{buildroot}/#{_libdir} -type l -exec rm {} \;
-find %{buildroot}/%{_libdir} -type l -name "libbareos*.so" ! -regex ".*libbareoscats-[a-z]+.*.so" -exec rm {} \;
-ls -la %{buildroot}/%{_libdir}
+find %{buildroot}/%{library_dir} -type l -name "libbareos*.so" -maxdepth 1 -exec rm {} \;
+ls -la %{buildroot}/%{library_dir}
 
 %if ! 0%{?python_plugins}
 rm -f %{buildroot}/%{plugin_dir}/python-*.so
@@ -802,13 +803,13 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %defattr(-, root, root)
 %attr(-, root, %{daemon_group}) %dir %{_sysconfdir}/bareos
 %dir %{backend_dir}
-%{_libdir}/libbareos-%{_libversion}.so
-%{_libdir}/libbareoscfg-%{_libversion}.so
-%{_libdir}/libbareosfind-%{_libversion}.so
-%{_libdir}/libbareoslmdb-%{_libversion}.so
+%{library_dir}/libbareos-%{_libversion}.so
+%{library_dir}/libbareoscfg-%{_libversion}.so
+%{library_dir}/libbareosfind-%{_libversion}.so
+%{library_dir}/libbareoslmdb-%{_libversion}.so
 %if !0%{?client_only}
-%{_libdir}/libbareosndmp-%{_libversion}.so
-%{_libdir}/libbareossd-%{_libversion}.so
+%{library_dir}/libbareosndmp-%{_libversion}.so
+%{library_dir}/libbareossd-%{_libversion}.so
 %endif
 # generic stuff needed from multiple bareos packages
 %dir /usr/lib/bareos/
@@ -817,7 +818,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %{script_dir}/bareos-config-lib.sh
 %{script_dir}/bareos-explorer
 %{script_dir}/btraceback.gdb
-%if "%{_libdir}/bareos/" != "/usr/lib/bareos/"
+%if "%{_libdir}" != "/usr/lib/"
 %dir %{_libdir}/bareos/
 %endif
 %dir %{plugin_dir}
@@ -839,13 +840,13 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %files database-common
 # catalog independent files
 %defattr(-, root, root)
+%{library_dir}/libbareossql-%{_libversion}.so
+%{library_dir}/libbareoscats-%{_libversion}.so
 %dir %{script_dir}/ddl
 %dir %{script_dir}/ddl/creates
 %dir %{script_dir}/ddl/drops
 %dir %{script_dir}/ddl/grants
 %dir %{script_dir}/ddl/updates
-%{_libdir}/libbareossql-%{_libversion}.so
-%{_libdir}/libbareoscats-%{_libversion}.so
 %{script_dir}/create_bareos_database
 %{script_dir}/drop_bareos_database
 %{script_dir}/drop_bareos_tables
@@ -933,7 +934,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %files devel
 %defattr(-, root, root)
 /usr/include/bareos
-%{_libdir}/*.la
+%{library_dir}/*.la
 
 
 %if 0%{?python_plugins}