X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=00a3e5c6a9d1e18470457a275e93be86fda3a1ab;hb=1dc71b592aabf1dc0b4ecaf17c65fcf21d45f544;hp=1fcbb4e16d8b99936afd33ecdc88dfd81b01a026;hpb=2e793736de444e2abd3c13916f98d8a55ef82adb;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 1fcbb4e16d..00a3e5c6a9 100755
--- 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@} po
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} 
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -54,8 +56,8 @@ 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);
@@ -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 $(dir_user) $(DESTDIR)$(working_dir); \
+	fi
+	-if test "x$(dir_group)" != "x" ; then \
+	   chgrp $(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-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}; \