X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=68aba65dc7d59e037770e8f5c493c6cbaff3d5c4;hb=807f5760c454a4472c99fcd695d2e61bce1106bb;hp=24bedb6b073be0980c5ec7f012f155ebb791a805;hpb=2d6309754e7a3ef719e8e950d5677f29ff53d1e5;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 24bedb6b07..68aba65dc7 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -19,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@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       src/console
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
 
-all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} 
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} manpages
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -62,6 +62,7 @@ autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/get
 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
@@ -94,12 +95,11 @@ installdirs:
 	   chmod 770 $(DESTDIR)$(working_dir); \
 	fi
 	-if test "x$(dir_user)" != "x" ; then \
-	   chown -f $(dir_user) $(DESTDIR)$(working_dir); \
+	   chown $(dir_user) $(DESTDIR)$(working_dir); \
 	fi
 	-if test "x$(dir_group)" != "x" ; then \
-	   chown -f :$(dir_group) $(DESTDIR)$(working_dir); \
+	   chgrp $(dir_group) $(DESTDIR)$(working_dir); \
 	fi
-#	$(MKDIR) $(DESTDIR)$(mandir)
 
 gnomedirs:
 	$(MKDIR) $(DESTDIR)/usr/share/pixmaps
@@ -184,18 +184,18 @@ Makefiles:
 	(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 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 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
 	@$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2
 	@$(RMF) -r autom4te.cache
-	@find . -name .#* -exec $(RMF) {} \;
+	@find . -name ".#*" -exec $(RMF) {} \;
 
 
 # clean for distribution