X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=cd7434b66c22e832f210ea871214218657f27225;hb=dbc2c7f30da831ec0e06a098bdba044ae41e8217;hp=1d4b15ad9ad94672d210e1c4f08874610cd84523;hpb=4cb5d5c326a52b489f85ad20bf04c23062ee3352;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 1d4b15ad9a..cd7434b66c 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -20,8 +20,8 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
-       src/console src/plugins/fd
+       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
@@ -46,7 +46,7 @@ all: Makefile
 	@for I in ${all_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
 	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
-			    echo ""; echo "";)); \
+			    echo ""; echo ""; exit 1;)); \
 	done
 
 depend:
@@ -56,8 +56,8 @@ depend:
 bacula-fd: Makefile	   
 	@for I in ${fd_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======; \
-			    echo ""; echo "";)); \
+	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+			    echo ""; echo ""; exit 1;)); \
 	done
 
 #-------------------------------------------------------------------------
@@ -190,11 +190,16 @@ Makefiles:
 	 chmod 755 dvd-handler)
 
 	(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_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 create_bacula_database update_bacula_tables make_bacula_tables; \
+	 chmod 755 grant_bacula_privileges drop_bacula_tables drop_bacula_database; \
 	 chmod 755 make_catalog_backup delete_catalog_backup)
+
+	(cd src/cats; \
+	 for db_type in @DB_BACKENDS@; do \
+	 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; \
+	 done)
+
 	(cd src/qt-console; \
 	 chmod 755 install_conf_file build-depkgs-qt-console)