diff -up bacula-5.0.3/src/cats/Makefile.in.orig bacula-5.0.3/src/cats/Makefile.in
--- bacula-5.0.3/src/cats/Makefile.in.orig	2010-10-06 14:37:54.000000000 +0200
+++ bacula-5.0.3/src/cats/Makefile.in	2010-10-06 14:41:35.000000000 +0200
@@ -134,12 +134,12 @@ libtool-uninstall:
 	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
 
 install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
-	$(INSTALL_SCRIPT) create_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/create_@DB_TYPE@_database
-	$(INSTALL_SCRIPT) update_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/update_@DB_TYPE@_tables
-	$(INSTALL_SCRIPT) make_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/make_@DB_TYPE@_tables
-	$(INSTALL_SCRIPT) grant_@DB_TYPE@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_TYPE@_privileges
-	$(INSTALL_SCRIPT) drop_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_tables
-	$(INSTALL_SCRIPT) drop_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_database
+	$(INSTALL_SCRIPT) create_{sqlite3,mysql,postgresql}_database $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) update_{sqlite3,mysql,postgresql}_tables $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) make_{sqlite3,mysql,postgresql}_tables $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) grant_{sqlite3,mysql,postgresql}_privileges $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) drop_{sqlite3,mysql,postgresql}_tables $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) drop_{sqlite3,mysql,postgresql}_database $(DESTDIR)$(scriptdir)
 
 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
 	$(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
@@ -177,12 +177,12 @@ install: @LIBTOOL_INSTALL_TARGET@ @INCLU
 	   $(INSTALL_SCRIPT) $$filename $(DESTDIR)$(scriptdir)/$$destname
 
 uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
-	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_TYPE@_database)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) update_@DB_TYPE@_tables)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) make_@DB_TYPE@_tables)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) grant_@DB_TYPE@_privileges)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_TYPE@_tables)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_TYPE@_database)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) create_{sqlite3,mysql,postgresql}_database)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) update_{sqlite3,mysql,postgresql}_tables)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) make_{sqlite3,mysql,postgresql}_tables)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) grant_{sqlite3,mysql,postgresql}_privileges)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_{sqlite3,mysql,postgresql}_tables)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_{sqlite3,mysql,postgresql}_database)
 
 	(cd $(DESTDIR)$(scriptdir); $(RMF) create_bacula_database)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) update_bacula_tables)
diff -up bacula-5.0.3/src/cats/create_bacula_database.in.orig bacula-5.0.3/src/cats/create_bacula_database.in
--- bacula-5.0.3/src/cats/create_bacula_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/create_bacula_database.in	2010-10-06 14:42:34.000000000 +0200
@@ -3,18 +3,7 @@
 # This routine creates the Bacula database
 #  using PostgreSQL, Ingres, MySQL, or SQLite.
 #
-if test xsqlite3 = x@DB_TYPE@ ; then
-  echo "Creating SQLite database"
-  @scriptdir@/create_@DB_TYPE@_database
-else
-  if test xmysql = x@DB_TYPE@ ; then
-    echo "Creating MySQL database"
-    @scriptdir@/create_mysql_database $*
-  elif test xingres = x@DB_TYPE@ ; then
-    echo "Creating Ingres database with $*"
-    @scriptdir@/create_ingres_database $*
-  else
-    echo "Creating PostgreSQL database"
-    @scriptdir@/create_postgresql_database $*
-  fi
-fi
+DB_TYPE=`ls @scriptdir@/create_[mpsi]*_database | cut -d'_' -f2`
+
+echo "Creating ${DB_TYPE} database"
+@scriptdir@/create_${DB_TYPE}_database $*
diff -up bacula-5.0.3/src/cats/create_ingres_database.in.orig bacula-5.0.3/src/cats/create_ingres_database.in
--- bacula-5.0.3/src/cats/create_ingres_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/create_ingres_database.in	2010-10-06 14:43:21.000000000 +0200
@@ -5,8 +5,8 @@
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 # use SQL_ASCII to be able to put any filename into
 #  the database even those created with unusual character sets
diff -up bacula-5.0.3/src/cats/create_mysql_database.in.orig bacula-5.0.3/src/cats/create_mysql_database.in
--- bacula-5.0.3/src/cats/create_mysql_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/create_mysql_database.in	2010-10-06 14:44:01.000000000 +0200
@@ -4,7 +4,7 @@
 #
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 if $bindir/mysql $* -f <<END-OF-DATA
 CREATE DATABASE ${db_name};
diff -up bacula-5.0.3/src/cats/create_postgresql_database.in.orig bacula-5.0.3/src/cats/create_postgresql_database.in
--- bacula-5.0.3/src/cats/create_postgresql_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/create_postgresql_database.in	2010-10-06 14:44:59.000000000 +0200
@@ -4,7 +4,7 @@
 #
 
 PATH="@SQL_BINDIR@:$PATH"
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
 
 #
 # use SQL_ASCII to be able to put any filename into
diff -up bacula-5.0.3/src/cats/create_sqlite3_database.in.orig bacula-5.0.3/src/cats/create_sqlite3_database.in
--- bacula-5.0.3/src/cats/create_sqlite3_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/create_sqlite3_database.in	2010-10-06 14:53:30.000000000 +0200
@@ -4,8 +4,8 @@
 
 bindir=@SQL_BINDIR@
 cd @working_dir@
-sqlite=@DB_TYPE@
-db_name=@db_name@
+sqlite=sqlite3
+db_name=${DB_NAME:-@db_name@}
 
 ${bindir}/${sqlite} $* ${db_name}.db <<END-OF-DATA
 END-OF-DATA
diff -up bacula-5.0.3/src/cats/delete_catalog_backup.in.orig bacula-5.0.3/src/cats/delete_catalog_backup.in
--- bacula-5.0.3/src/cats/delete_catalog_backup.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/delete_catalog_backup.in	2010-10-06 14:54:12.000000000 +0200
@@ -2,6 +2,6 @@
 #
 # This script deletes a catalog dump
 #
-db_name=@db_name@
+db_name=${1:-@db_name@}
 
 rm -f @working_dir@/${db_name}.sql
diff -up bacula-5.0.3/src/cats/drop_bacula_database.in.orig bacula-5.0.3/src/cats/drop_bacula_database.in
--- bacula-5.0.3/src/cats/drop_bacula_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_bacula_database.in	2010-10-06 14:54:57.000000000 +0200
@@ -3,16 +3,7 @@
 #  Drop Bacula database -- works for whatever is configured,
 #    MySQL, SQLite, PostgreSQL, Ingres
 #
-if test xsqlite3 = x@DB_TYPE@ ; then
-  @scriptdir@/drop_@DB_TYPE@_database $*
-else
-  if test xmysql = x@DB_TYPE@ ; then 
-    echo "Making MySQL database"
-    @scriptdir@/drop_mysql_database $*
-  elif test xingres = x@DB_TYPE@ ; then
-    echo "Dropping Ingres database"
-    @scriptdir@/drop_ingres_database $*
-  else
-    @scriptdir@/drop_postgresql_database $*
-  fi
-fi
+DB_TYPE=`ls @scriptdir@/drop_[mpsi]*_database | cut -d'_' -f2`
+
+echo "Dropping ${DB_TYPE} database"
+@scriptdir@/drop_${DB_TYPE}_database $*
diff -up bacula-5.0.3/src/cats/drop_bacula_tables.in.orig bacula-5.0.3/src/cats/drop_bacula_tables.in
--- bacula-5.0.3/src/cats/drop_bacula_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_bacula_tables.in	2010-10-06 14:55:40.000000000 +0200
@@ -3,21 +3,7 @@
 #  Drop Bacula tables -- works for whatever is configured,
 #    MySQL, SQLite, Ingres, or PostgreSQL
 #
-if test xsqlite3 = x@DB_TYPE@ ; then
-  @scriptdir@/drop_@DB_TYPE@_tables $*
-  echo "Dropped SQLite tables"
-else
-  if test xmysql = x@DB_TYPE@ ; then 
-    echo "Making MySQL tables"
-    @scriptdir@/drop_mysql_tables $*
-    echo "Dropped MySQL tables"
-  elif test xingres = x@DB_TYPE@ ; then
-    echo "Dropping Ingres tables"
-    @scriptdir@/drop_ingres_tables $*
-    echo "Dropped Ingres tables"
-  else
-    # hardcoded database name - should be a parameter
-    @scriptdir@/drop_postgresql_tables $*
-    echo "Dropped PostgreSQL tables"
-  fi
-fi
+DB_TYPE=`ls @scriptdir@/drop_[mpsi]*_tables | cut -d'_' -f2`
+
+echo "Dropping ${DB_TYPE} tables"
+@scriptdir@/drop_${DB_TYPE}_tables $*
diff -up bacula-5.0.3/src/cats/drop_ingres_database.in.orig bacula-5.0.3/src/cats/drop_ingres_database.in
--- bacula-5.0.3/src/cats/drop_ingres_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_ingres_database.in	2010-10-06 14:56:14.000000000 +0200
@@ -5,8 +5,8 @@
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 if destroydb -u${db_user} ${db_name}
 then
diff -up bacula-5.0.3/src/cats/drop_ingres_tables.in.orig bacula-5.0.3/src/cats/drop_ingres_tables.in
--- bacula-5.0.3/src/cats/drop_ingres_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_ingres_tables.in	2010-10-06 14:57:05.000000000 +0200
@@ -4,8 +4,8 @@
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 sql -u${db_user} ${db_name} $* <<END-OF-DATA
 DROP TABLE Filename;
diff -up bacula-5.0.3/src/cats/drop_mysql_database.in.orig bacula-5.0.3/src/cats/drop_mysql_database.in
--- bacula-5.0.3/src/cats/drop_mysql_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_mysql_database.in	2010-10-06 14:58:03.000000000 +0200
@@ -4,10 +4,9 @@
 #
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
-if test xmysql = x@DB_TYPE@ ; then 
-  $bindir/mysql $* -f <<END-OF-DATA
+$bindir/mysql $* -f <<END-OF-DATA
     DROP DATABASE ${db_name};
 END-OF-DATA
   if test $? -eq 0 ; then
@@ -15,7 +14,4 @@ END-OF-DATA
   else
     echo "Drop of ${db_name} database failed."
   fi
-else
-  echo "Bacula is not configured for a MySQL database."
-fi
 exit 0
diff -up bacula-5.0.3/src/cats/drop_mysql_tables.in.orig bacula-5.0.3/src/cats/drop_mysql_tables.in
--- bacula-5.0.3/src/cats/drop_mysql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_mysql_tables.in	2010-10-06 14:58:34.000000000 +0200
@@ -3,7 +3,7 @@
 # shell script to delete Bacula tables for MySQL
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 if $bindir/mysql $* <<END-OF-DATA
 USE ${db_name};
diff -up bacula-5.0.3/src/cats/drop_postgresql_database.in.orig bacula-5.0.3/src/cats/drop_postgresql_database.in
--- bacula-5.0.3/src/cats/drop_postgresql_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_postgresql_database.in	2010-10-06 14:59:04.000000000 +0200
@@ -4,7 +4,7 @@
 #
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 if $bindir/dropdb ${db_name}
 then
diff -up bacula-5.0.3/src/cats/drop_postgresql_tables.in.orig bacula-5.0.3/src/cats/drop_postgresql_tables.in
--- bacula-5.0.3/src/cats/drop_postgresql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_postgresql_tables.in	2010-10-06 14:59:28.000000000 +0200
@@ -3,7 +3,7 @@
 # shell script to delete Bacula tables for PostgreSQL
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 drop table unsavedfiles;
diff -up bacula-5.0.3/src/cats/drop_sqlite3_database.in.orig bacula-5.0.3/src/cats/drop_sqlite3_database.in
--- bacula-5.0.3/src/cats/drop_sqlite3_database.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_sqlite3_database.in	2010-10-06 15:00:03.000000000 +0200
@@ -1,13 +1,8 @@
 #!/bin/sh
 #
 # shell script to drop Bacula SQLite tables
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
-
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then 
   cd @working_dir@
   rm -rf ${db_name}.db
   echo "SQLite database dropped."
-else
-  echo "Bacula is not configured for an SQLite database."
-fi
diff -up bacula-5.0.3/src/cats/drop_sqlite3_tables.in.orig bacula-5.0.3/src/cats/drop_sqlite3_tables.in
--- bacula-5.0.3/src/cats/drop_sqlite3_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/drop_sqlite3_tables.in	2010-10-06 15:00:33.000000000 +0200
@@ -3,6 +3,6 @@
 # shell script to Delete the SQLite Bacula database (same as deleting 
 #  the tables)
 #
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 rm -f @working_dir@/${db_name}.db
diff -up bacula-5.0.3/src/cats/grant_bacula_privileges.in.orig bacula-5.0.3/src/cats/grant_bacula_privileges.in
--- bacula-5.0.3/src/cats/grant_bacula_privileges.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/grant_bacula_privileges.in	2010-10-06 15:01:31.000000000 +0200
@@ -4,20 +4,7 @@
 #  Bacula tables for PostgreSQL or MySQL.
 # SQLite does not have permissions.
 #
-if test xmysql = x@DB_TYPE@ ; then 
-  echo "Granting MySQL privileges"
-  @scriptdir@/grant_mysql_privileges $*
-else
-  if test xpostgresql = x@DB_TYPE@ ; then 
-    echo "Granting PostgreSQL privileges"
-    @scriptdir@/grant_postgresql_privileges $*
-  elif test xingres = x@DB_TYPE@ ; then
-    echo "Granting Ingres privileges"
-    @scriptdir@/grant_ingres_privileges $*
-  else
-    if test xsqlite3 = x@DB_TYPE@ ; then 
-      echo "Granting SQLite privileges"
-      @scriptdir@/grant_@DB_TYPE@_privileges $*
-    fi
-  fi
-fi
+DB_TYPE=`ls @scriptdir@/grant_[mpsi]*_privileges | cut -d'_' -f2`
+
+echo "Granting ${DB_TYPE} privileges"
+@scriptdir@/grant_${DB_TYPE}_privileges $*
diff -up bacula-5.0.3/src/cats/grant_ingres_privileges.in.orig bacula-5.0.3/src/cats/grant_ingres_privileges.in
--- bacula-5.0.3/src/cats/grant_ingres_privileges.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/grant_ingres_privileges.in	2010-10-06 15:02:08.000000000 +0200
@@ -4,8 +4,8 @@
 #
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 sql iidbdb $* <<END-OF-DATA
 CREATE USER ${db_user}
diff -up bacula-5.0.3/src/cats/grant_mysql_privileges.in.orig bacula-5.0.3/src/cats/grant_mysql_privileges.in
--- bacula-5.0.3/src/cats/grant_mysql_privileges.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/grant_mysql_privileges.in	2010-10-06 15:03:17.000000000 +0200
@@ -2,9 +2,9 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
diff -up bacula-5.0.3/src/cats/grant_postgresql_privileges.in.orig bacula-5.0.3/src/cats/grant_postgresql_privileges.in
--- bacula-5.0.3/src/cats/grant_postgresql_privileges.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/grant_postgresql_privileges.in	2010-10-06 15:04:01.000000000 +0200
@@ -2,9 +2,9 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
+db_user=${DB_USER:-@db_user@}
 
 $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
diff -up bacula-5.0.3/src/cats/make_bacula_tables.in.orig bacula-5.0.3/src/cats/make_bacula_tables.in
--- bacula-5.0.3/src/cats/make_bacula_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_bacula_tables.in	2010-10-06 15:04:32.000000000 +0200
@@ -3,18 +3,7 @@
 # This routine makes the appropriately configured
 #  Bacula tables for PostgreSQL, Ingres, MySQL, or SQLite.
 #
-if test xsqlite3 = x@DB_TYPE@ ; then
-  echo "Making SQLite tables"
-  @scriptdir@/make_@DB_TYPE@_tables $*
-else
-  if test xmysql = x@DB_TYPE@ ; then 
-    echo "Making MySQL tables"
-    @scriptdir@/make_mysql_tables $*
-  elif test xingres = x@DB_TYPE@ ; then
-    echo "Making Ingres tables"
-    @scriptdir@/make_ingres_tables $*
-  else
-    echo "Making PostgreSQL tables"
-    @scriptdir@/make_postgresql_tables $*
-  fi
-fi
+DB_TYPE=`ls @scriptdir@/make_[mpsi]*_tables | cut -d'_' -f2`
+
+echo "Making ${DB_TYPE} tables"
+@scriptdir@/make_${DB_TYPE}_tables $*
diff -up bacula-5.0.3/src/cats/make_catalog_backup.in.orig bacula-5.0.3/src/cats/make_catalog_backup.in
--- bacula-5.0.3/src/cats/make_catalog_backup.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_catalog_backup.in	2010-10-06 15:06:07.000000000 +0200
@@ -17,14 +17,12 @@
 #     (default "")
 #
 #
+DB_TYPE=`ls @scriptdir@/create_[mpsi]*_database | cut -d'_' -f2`
 BINDIR=@SQL_BINDIR@
 
 cd @working_dir@
 rm -f $1.sql
-if test xsqlite = x@DB_TYPE@ ; then
-  echo ".dump" | ${BINDIR}/sqlite $1.db >$1.sql
-else
-  if test xmysql = x@DB_TYPE@ ; then
+  if test xmysql = x${DB_TYPE}; then
     if test $# -gt 2; then
       MYSQLPASSWORD=" --password=$3"
     else
@@ -37,7 +35,7 @@ else
     fi
     ${BINDIR}/mysqldump -u ${2}${MYSQLPASSWORD}${MYSQLHOST} -f --opt $1 >$1.sql
   else			      
-    if test xpostgresql = x@DB_TYPE@ ; then
+    if test xpostgresql = x${DB_TYPE}; then
       if test $# -gt 2; then
 	PGPASSWORD=$3
 	export PGPASSWORD
@@ -53,7 +51,6 @@ else
       echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql
     fi
   fi
-fi
 #
 #  To read back a MySQL database use: 
 #     cd @working_dir@
diff -up bacula-5.0.3/src/cats/make_catalog_backup.pl.in.orig bacula-5.0.3/src/cats/make_catalog_backup.pl.in
--- bacula-5.0.3/src/cats/make_catalog_backup.pl.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_catalog_backup.pl.in	2010-10-06 15:07:05.000000000 +0200
@@ -44,7 +44,7 @@ use strict;
 $ENV{PATH}="@SQL_BINDIR@:$ENV{PATH}";
 
 my $cat = shift or die "Usage: $0 catalogname";
-my $dir_conf='@sbindir@/dbcheck -B -c @sysconfdir@/bacula-dir.conf';
+my $dir_conf='@bindir@/dbcheck -B -c @sysconfdir@/bacula-dir.conf';
 my $wd = "@working_dir@";
 
 sub dump_sqlite
diff -up bacula-5.0.3/src/cats/make_ingres_tables.in.orig bacula-5.0.3/src/cats/make_ingres_tables.in
--- bacula-5.0.3/src/cats/make_ingres_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_ingres_tables.in	2010-10-06 15:07:36.000000000 +0200
@@ -3,7 +3,7 @@
 # shell script to create Bacula PostgreSQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
 
 sql $* ${db_name} <<END-OF-DATA
 
diff -up bacula-5.0.3/src/cats/make_mysql_tables.in.orig bacula-5.0.3/src/cats/make_mysql_tables.in
--- bacula-5.0.3/src/cats/make_mysql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_mysql_tables.in	2010-10-06 15:08:00.000000000 +0200
@@ -4,7 +4,7 @@
 #
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
 
 if mysql $* -f <<END-OF-DATA
 USE ${db_name};
diff -up bacula-5.0.3/src/cats/make_postgresql_tables.in.orig bacula-5.0.3/src/cats/make_postgresql_tables.in
--- bacula-5.0.3/src/cats/make_postgresql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_postgresql_tables.in	2010-10-06 15:08:29.000000000 +0200
@@ -4,7 +4,7 @@
 #
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
+db_name=${DB_NAME:-@db_name@}
 
 psql -f - -d ${db_name} $* <<END-OF-DATA
 
diff -up bacula-5.0.3/src/cats/make_sqlite3_tables.in.orig bacula-5.0.3/src/cats/make_sqlite3_tables.in
--- bacula-5.0.3/src/cats/make_sqlite3_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/make_sqlite3_tables.in	2010-10-06 15:09:05.000000000 +0200
@@ -5,8 +5,8 @@
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
 cd @working_dir@
-sqlite=@DB_TYPE@
-db_name=@db_name@
+sqlite=sqlite3
+db_name=${DB_NAME:-@db_name@}
 
 ${sqlite} $* ${db_name}.db <<END-OF-DATA
 CREATE TABLE Filename (
diff -up bacula-5.0.3/src/cats/mysql.in.orig bacula-5.0.3/src/cats/mysql.in
--- bacula-5.0.3/src/cats/mysql.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/mysql.in	2010-10-06 15:10:48.000000000 +0200
@@ -3,6 +3,6 @@
 # shell script to create Bacula MySQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 $bindir/mysql $* ${db_name}
diff -up bacula-5.0.3/src/cats/postgresql.in.orig bacula-5.0.3/src/cats/postgresql.in
--- bacula-5.0.3/src/cats/postgresql.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/postgresql.in	2010-10-06 15:11:09.000000000 +0200
@@ -3,6 +3,6 @@
 # shell script to create Bacula PostgreSQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 $bindir/psql $* ${db_name}
diff -up bacula-5.0.3/src/cats/sqlite.in.orig bacula-5.0.3/src/cats/sqlite.in
--- bacula-5.0.3/src/cats/sqlite.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/sqlite.in	2010-10-06 15:11:52.000000000 +0200
@@ -3,5 +3,6 @@
 # shell script to invoke SQLite on Bacula database
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
-$bindir/sqlite @working_dir@/${db_name}.db
+db_name=${DB_NAME:-@db_name@}
+
+$bindir/sqlite3 @working_dir@/${db_name}.db
diff -up bacula-5.0.3/src/cats/update_bacula_tables.in.orig bacula-5.0.3/src/cats/update_bacula_tables.in
--- bacula-5.0.3/src/cats/update_bacula_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/update_bacula_tables.in	2010-10-06 15:12:36.000000000 +0200
@@ -3,19 +3,7 @@
 # This routine alters the appropriately configured
 #  Bacula tables for PostgreSQL, Ingres, MySQL, or SQLite.
 #
-if test xsqlite3 = x@DB_TYPE@ ; then
-  echo "Altering SQLite tables"
-  @scriptdir@/update_@DB_TYPE@_tables $*
-fi
-if test xmysql = x@DB_TYPE@ ; then
-  echo "Altering MySQL tables"
-  @scriptdir@/update_mysql_tables $*
-fi
-if test xingres = x@DB_TYPE@ ; then
-  echo "Altering Ingres tables"
-  @scriptdir@/update_ingres_tables $*
-fi
-if test xpostgresql = x@DB_TYPE@ ; then
-  echo "Altering PostgreSQL tables"
-  @scriptdir@/update_postgresql_tables $*
-fi
+DB_TYPE=`ls @scriptdir@/update_[mpsi]*_tables | cut -d'_' -f2`
+
+echo "Altering ${DB_TYPE} tables"
+@scriptdir@/update_${DB_TYPE}_tables $*
diff -up bacula-5.0.3/src/cats/update_ingres_tables.in.orig bacula-5.0.3/src/cats/update_ingres_tables.in
--- bacula-5.0.3/src/cats/update_ingres_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/update_ingres_tables.in	2010-10-06 15:13:03.000000000 +0200
@@ -6,7 +6,7 @@ echo " "
 echo "This script will update a Bacula Ingres database (if needed)"
 echo " "
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 echo "Update of Bacula Ingres tables succeeded. (nothing to do)"
 exit 0
diff -up bacula-5.0.3/src/cats/update_mysql_tables.in.orig bacula-5.0.3/src/cats/update_mysql_tables.in
--- bacula-5.0.3/src/cats/update_mysql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/update_mysql_tables.in	2010-10-06 15:13:40.000000000 +0200
@@ -10,7 +10,7 @@ echo " Standard version 3.0 to 5.0"
 echo " "
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 if mysql $* -f <<END-OF-DATA
 USE ${db_name};
diff -up bacula-5.0.3/src/cats/update_postgresql_tables.in.orig bacula-5.0.3/src/cats/update_postgresql_tables.in
--- bacula-5.0.3/src/cats/update_postgresql_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/update_postgresql_tables.in	2010-10-06 15:14:31.000000000 +0200
@@ -10,7 +10,7 @@ echo " "
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=@db_name@
+db_name=${DB_NAME:-@db_name@}
 
 if psql -f - -d ${db_name} $* <<END-OF-DATA
 BEGIN; -- Necessary for Bacula core
diff -up bacula-5.0.3/src/cats/update_sqlite3_tables.in.orig bacula-5.0.3/src/cats/update_sqlite3_tables.in
--- bacula-5.0.3/src/cats/update_sqlite3_tables.in.orig	2010-08-05 16:29:51.000000000 +0200
+++ bacula-5.0.3/src/cats/update_sqlite3_tables.in	2010-10-06 15:14:58.000000000 +0200
@@ -14,8 +14,8 @@ echo " "
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
 cd @working_dir@
-sqlite=@DB_TYPE@
-db_name=@db_name@
+sqlite=sqlite3
+db_name=${DB_NAME:-@db_name@}
 
 ${sqlite} $* ${db_name}.db <<END-OF-DATA
 BEGIN;