Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index f53148cf684cf7be310644b985a8cd754bf213fa..3e89b45a0fa7c672c13cc7539e8be7b58c96363f 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -20,7 +20,7 @@ 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@ \
+       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
        src/console src/plugins/fd
 
 # Non-client-only directores
@@ -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:
@@ -189,6 +195,8 @@ Makefiles:
         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)
+       (cd src/qt-console; \
+        chmod 755 install_conf_file build-depkgs-qt-console)
 
 clean:
        @for I in ${all_subdirs} ; \