X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=6fba576ecb2db9047c19e0bfa45e1f77cd3f24cf;hb=557b60a603a6ff1dd27923317a8420f627fed103;hp=e4a0562cdd718402f8a1788b8fc44e1c5340a1fa;hpb=9cc60416baa0166420327c7f15f6ede12b4d06e8;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index e4a0562cdd..6fba576ecb 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,6 +1,7 @@
 # 
 # Version $Id$
-# 
+# Master Makefile
+#
 @MCOMMON@
 
 working_dir=@working_dir@
@@ -19,8 +20,8 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-	     @READLINE_SRC@ src/console \
-	     @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
+       @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       src/console
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
@@ -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