Allow group to cd to sysconfdir

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 476fdf5004148af766ccbc43f44490f562fadb8b..5483fe319741746d4c2c56f55a65135c0de5e779 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,5 +1,4 @@
 # 
-# Version $Id$
 # Master Makefile
 #
 @MCOMMON@
@@ -20,8 +19,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 +33,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 +44,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 +55,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
 
 #-------------------------------------------------------------------------
@@ -92,7 +94,16 @@ libtool: Makefile $(LIBTOOL_DEPS)
 installdirs:
        $(MKDIR) $(DESTDIR)$(sbindir)
        $(MKDIR) $(DESTDIR)$(sysconfdir)
+       chmod 770 $(DESTDIR)$(sysconfdir)
+       -if test "x$(dir_user)" != "x" ; then \
+          chown $(dir_user) $(DESTDIR)$(sysconfdir); \
+       fi
+       -if test "x$(dir_group)" != "x" ; then \
+          chgrp $(dir_group) $(DESTDIR)$(sysconfdir); \
+       fi
        $(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 +141,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,18 +196,22 @@ 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)
 
+       @for I in @DB_BACKENDS@ ; do \
+         (cd src/cats; \
+          chmod 755 create_$${I}_database update_$${I}_tables make_$${I}_tables; \
+          chmod 755 grant_$${I}_privileges drop_$${I}_tables drop_$${I}_database); \
+         done
+
+       (cd src/qt-console; \
+        chmod 755 install_conf_file build-depkgs-qt-console)
+
 clean:
        @for I in ${all_subdirs} ; \
          do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done
-       @if test `make --version | head -n1 | cut -c1-3` = "GNU" ; then \
-          (cd src/win32; ${MAKE} clean) \
-       fi
        @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
        @$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2