17Mar06

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 59442a576ff2260f1df5160a687f009b1396a52e..f6cd26a08a142e702a805bc2aff55581d4af298f 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@
@@ -21,9 +23,9 @@ fd_subdirs = src scripts src/lib src/findlib src/filed \
             @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
 
 # Non-client-only directores
-subdirs =    src/cats src/dird src/stored src/tools
+subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
 
-all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} 
 
 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -54,6 +56,9 @@ bacula-fd: Makefile
        done
 
 #-------------------------------------------------------------------------
+autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/gettext-macros/*
+       cd autoconf && aclocal -I bacula-macros -I gettext-macros
+
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
        cd $(srcdir);
        ${RMF} -f config.cache config.log config.out config.status src/config.h
@@ -85,6 +90,10 @@ installdirs:
        $(MKDIR) $(DESTDIR)$(sysconfdir)
        $(MKDIR) $(DESTDIR)$(scriptdir)
        $(MKDIR) $(DESTDIR)$(working_dir)
+       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:
@@ -165,7 +174,7 @@ Makefiles:
        (cd scripts; \
        chmod 755 startmysql stopmysql bacula startit stopit btraceback; \
        chmod 755 mtx-changer bconsole gconsole devel_bacula; \
-       chmod 755 dvd-freespace dvd-writepart)
+       chmod 755 dvd-handler)
 
        (cd src/cats; \
        chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \