Allow group to cd to sysconfdir

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 38b154338d731ec77a1f06ca5afa89d763018085..5483fe319741746d4c2c56f55a65135c0de5e779 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,5 +1,4 @@
 # 
-# Version $Id$
 # Master Makefile
 #
 @MCOMMON@
@@ -21,7 +20,7 @@ dummy:
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
        @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
-       src/console src/plugins/fd
+       src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
@@ -46,7 +45,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 +55,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
 
 #-------------------------------------------------------------------------
@@ -95,6 +94,13 @@ 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)
@@ -190,11 +196,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)
+
+       @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)