X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=6fba576ecb2db9047c19e0bfa45e1f77cd3f24cf;hb=5c1b9d4822c3b3eff23fee42dff20180205a53cd;hp=f6cd26a08a142e702a805bc2aff55581d4af298f;hpb=f4bcd52673e6454e4f704ba75d073cf886052201;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index f6cd26a08a..6fba576ecb 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,6 +1,7 @@
 # 
 # Version $Id$
-# 
+# Master Makefile
+#
 @MCOMMON@
 
 working_dir=@working_dir@
@@ -19,13 +20,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,18 +63,11 @@ 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
 
-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
-	chmod 755 configure
-	@rm -f config.cache
-
 config.status:
 	if test -x config.status; then config.status --recheck; \
 	else $(SHELL) configure; fi
@@ -89,12 +83,16 @@ installdirs:
 	$(MKDIR) $(DESTDIR)$(sbindir)
 	$(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)
+	-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
@@ -172,27 +170,25 @@ 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_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