Remove last traces of @SQL_BINDIR@ and @DB_TYPE@

[bacula/bacula] / bacula / src / cats / make_catalog_backup.in.patch

diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch
index 7279dc005b5e1bf49e4c6a77bdd08f2be6a5f802..08988b26a750a0a0eeae9f3f3fdd58804fc5f777 100644 (file)
--- a/bacula/src/cats/make_catalog_backup.in.patch
+++ b/bacula/src/cats/make_catalog_backup.in.patch
@@ -1,20 +1,12 @@
 --- make_catalog_backup.in      2006-12-09 10:17:05.000000000 -0500
-+++ make_catalog_backup.in.fixed        2006-12-09 10:24:40.000000000 -0500
-@@ -16,7 +16,7 @@
- cd @working_dir@
- rm -f bacula.sql
- if test xsqlite = x@DB_TYPE@ ; then
--  echo ".dump" | ${BINDIR}/sqlite $1.db >$1.sql
-+  echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql
- else
-   if test xmysql = x@DB_TYPE@ ; then
-     if test $# -gt 2; then
-@@ -33,7 +33,7 @@
-       fi
-       exec ${BINDIR}/pg_dump -c -U $2 $1 >$1.sql
-     else
--      echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql
-+      echo ".dump" | /usr/lib/bacula/sqlite/sqlite3 $1.db >$1.sql
-     fi
-   fi
- fi
+++ make_catalog_backup.in.fixed        2006-12-09 10:24:40.000000000 -0500
+@@ -56,8 +56,7 @@ rm -f $1.sql
+ 
+ case ${db_type} in
+   sqlite3)
+-    BINDIR=@SQLITE_BINDIR@
+-    echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql
++    echo ".dump" | /opt/bacula/sqlite/sqlite3 $1.db >$1.sql
+     ;;
+   mysql)
+     BINDIR=@MYSQL_BINDIR@