This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 64042e8390ab841cdf3f66e9c1500883d7627919..4bed35a7636eca6c383f9dcf342982cb8f3ae988 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -4,6 +4,8 @@
 @MCOMMON@
 
 working_dir=@working_dir@
+dir_group=@dir_group@
+dir_user=@dir_user@
 
 srcdir =       @srcdir@
 VPATH =        @srcdir@
@@ -68,7 +70,7 @@ old-configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h
        cd $(srcdir);
        ${RMF} -f config.cache config.log config.out config.status src/config.h
        autoconf --include=$(srcdir)/autoconf \
-       autoconf/configure.in > configure
+           autoconf/configure.in > configure
        chmod 755 configure
        @rm -f config.cache
 
@@ -87,7 +89,16 @@ installdirs:
        $(MKDIR) $(DESTDIR)$(sbindir)
        $(MKDIR) $(DESTDIR)$(sysconfdir)
        $(MKDIR) $(DESTDIR)$(scriptdir)
-       $(MKDIR) $(DESTDIR)$(working_dir)
+       -if test ! -d $(DESTDIR)$(working_dir) ; then \
+          $(MKDIR) $(DESTDIR)$(working_dir); \
+          chmod 770 $(DESTDIR)$(working_dir); \
+       fi
+       -if test "x$(dir_user)" != "x" ; then \
+          chown -f $(dir_user) $(DESTDIR)$(working_dir); \
+       fi
+       -if test "x$(dir_group)" != "x" ; then \
+          chown -f :$(dir_group) $(DESTDIR)$(working_dir); \
+       fi
 #      $(MKDIR) $(DESTDIR)$(mandir)
 
 gnomedirs:
@@ -166,18 +177,16 @@ Makefile: Makefile.in
 Makefiles:
        $(SHELL) config.status
        (cd scripts; \
-       chmod 755 startmysql stopmysql bacula startit stopit btraceback; \
-       chmod 755 mtx-changer bconsole gconsole devel_bacula; \
-       chmod 755 dvd-handler)
+        chmod 755 startmysql stopmysql bacula startit stopit btraceback; \
+        chmod 755 mtx-changer bconsole gconsole devel_bacula; \
+        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_NAME@_database   update_@DB_NAME@_tables  make_@DB_NAME@_tables; \
-       chmod 755 grant_@DB_NAME@_privileges  drop_@DB_NAME@_tables    drop_@DB_NAME@_database; \
-          \
-       chmod 755 make_catalog_backup delete_catalog_backup)
+        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_NAME@_database   update_@DB_NAME@_tables  make_@DB_NAME@_tables; \
+        chmod 755 grant_@DB_NAME@_privileges  drop_@DB_NAME@_tables    drop_@DB_NAME@_database; \
+        chmod 755 make_catalog_backup delete_catalog_backup)
 
 clean:
        @for I in ${all_subdirs}; \