Add support for install to /opt/bacula

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 4187ecb951b0bb1df09622722e031a99aadf255b..6fba576ecb2db9047c19e0bfa45e1f77cd3f24cf 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,6 +1,7 @@
 # 
 # Version $Id$
-# 
+# Master Makefile
+#
 @MCOMMON@
 
 working_dir=@working_dir@
@@ -19,7 +20,7 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
        src/console
 
 # Non-client-only directores
@@ -67,14 +68,6 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autocon
        autoconf/configure.in > configure
        chmod 755 configure
 
-old-configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h
-       cd $(srcdir);
-       ${RMF} -f config.cache config.log config.out config.status src/config.h
-       autoconf --include=$(srcdir)/autoconf \
-       autoconf/configure.in > configure
-       chmod 755 configure
-       @rm -f config.cache
-
 config.status:
        if test -x config.status; then config.status --recheck; \
        else $(SHELL) configure; fi
@@ -184,8 +177,8 @@ Makefiles:
        (cd src/cats; \
         chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \
         chmod 755 grant_bacula_privileges     drop_bacula_tables       drop_bacula_database; \
-        chmod 755 create_@DB_NAME@_database   update_@DB_NAME@_tables  make_@DB_NAME@_tables; \
-        chmod 755 grant_@DB_NAME@_privileges  drop_@DB_NAME@_tables    drop_@DB_NAME@_database; \
+        chmod 755 create_@DB_TYPE@_database   update_@DB_TYPE@_tables  make_@DB_TYPE@_tables; \
+        chmod 755 grant_@DB_TYPE@_privileges  drop_@DB_TYPE@_tables    drop_@DB_TYPE@_database; \
         chmod 755 make_catalog_backup delete_catalog_backup)
 
 clean:
@@ -195,7 +188,7 @@ clean:
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
        @$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2
        @$(RMF) -r autom4te.cache
-       @find . -name .#* -exec $(RMF) {} \;
+       @find . -name ".#*" -exec $(RMF) {} \;
 
 
 # clean for distribution