X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=cd7434b66c22e832f210ea871214218657f27225;hb=dbc2c7f30da831ec0e06a098bdba044ae41e8217;hp=46c9818a6a17721f72bcc676ad7b3b736914a7fe;hpb=60480cabaa0a4bf7a3365ecac19729a936d1e0b2;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 46c9818a6a..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
@@ -34,6 +34,9 @@ DIST_CFG = autoconf/aclocal.m4 autoconf/configure.in \
 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
 	autoconf/install-sh autoconf/mkinstalldirs
 
+doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
+	    INSTALL
+
 MKDIR = $(srcdir)/autoconf/mkinstalldirs
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
@@ -42,8 +45,8 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
 all: Makefile
 	@for I in ${all_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
-			    echo ""; echo "";)); \
+	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+			    echo ""; echo ""; exit 1;)); \
 	done
 
 depend:
@@ -53,8 +56,8 @@ depend:
 bacula-fd: Makefile	   
 	@for I in ${fd_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) all || (echo ""; echo ""; echo "	 ====== Error in `pwd` ======; \
-			    echo ""; echo "";)); \
+	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+			    echo ""; echo ""; exit 1;)); \
 	done
 
 #-------------------------------------------------------------------------
@@ -93,6 +96,8 @@ installdirs:
 	$(MKDIR) $(DESTDIR)$(sbindir)
 	$(MKDIR) $(DESTDIR)$(sysconfdir)
 	$(MKDIR) $(DESTDIR)$(scriptdir)
+	$(MKDIR) $(DESTDIR)$(docdir)
+	$(MKDIR) $(DESTDIR)$(archivedir)
 	-if test ! -d $(DESTDIR)$(working_dir) ; then \
 	   $(MKDIR) $(DESTDIR)$(working_dir); \
 	   chmod 770 $(DESTDIR)$(working_dir); \
@@ -130,6 +135,7 @@ install-menu-consolehelper: gnomedirs
 	ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
 
 install: installdirs
+	@for I in $(doc_files) ; do $(INSTALL_DATA) $$I $(DESTDIR)${docdir}; done
 	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 uninstall:
@@ -184,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)