kes Fix optional files in Makefile.in of src/filed that caused

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 1fcbb4e16d8b99936afd33ecdc88dfd81b01a026..4187ecb951b0bb1df09622722e031a99aadf255b 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@
@@ -17,13 +19,13 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-            @READLINE_SRC@ src/console \
-            @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
+       @READLINE_SRC@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       src/console
 
 # 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@} po
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} manpages
 
 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -54,12 +56,13 @@ bacula-fd: Makefile
        done
 
 #-------------------------------------------------------------------------
-autoconf/aclocal.m4: autoconf/bacula-macros/*
-       cd autoconf && aclocal -I bacula-macros
+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
+       ${RMF} -rf autoconf/autom4te.cache autom4te.cache
        autoconf --prepend-include=$(srcdir)/autoconf \
        autoconf/configure.in > configure
        chmod 755 configure
@@ -87,8 +90,16 @@ installdirs:
        $(MKDIR) $(DESTDIR)$(sbindir)
        $(MKDIR) $(DESTDIR)$(sysconfdir)
        $(MKDIR) $(DESTDIR)$(scriptdir)
-       $(MKDIR) $(DESTDIR)$(working_dir)
-#      $(MKDIR) $(DESTDIR)$(mandir)
+       -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 $(dir_user) $(DESTDIR)$(working_dir); \
+       fi
+       -if test "x$(dir_group)" != "x" ; then \
+          chgrp $(dir_group) $(DESTDIR)$(working_dir); \
+       fi
 
 gnomedirs:
        $(MKDIR) $(DESTDIR)/usr/share/pixmaps
@@ -166,21 +177,19 @@ 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-freespace dvd-writepart)
+        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}; \
+       @for I in ${all_subdirs} src/win32; \
          do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done
        @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum