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

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index ccdec6f3c1..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@}
+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
@@ -84,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:
@@ -113,34 +127,34 @@ install-menu-consolehelper: gnomedirs
 	ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
 
 install: installdirs
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 uninstall:
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 install-autostart:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-dir:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-fd:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-sd:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 uninstall-autostart:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-dir:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-fd:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-sd:
-	(cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-menu:
 	rm -f $(DESTDIR)/usr/share/pixmaps/bacula.png
@@ -163,17 +177,16 @@ Makefile: Makefile.in
 Makefiles:
 	$(SHELL) config.status
 	(cd scripts; \
-	chmod 755 startmysql stopmysql bacula fd startit stopit btraceback; \
-	chmod 755 mtx-changer bconsole gconsole devel_bacula)
+	 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}; \
@@ -187,10 +200,10 @@ clean:
 
 # clean for distribution
 distclean:
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done
-	@for I in $(all_subdirs); do (cd $$I; $(RMF) startit stopit btraceback); done
-	@(cd $(srcdir); $(RMF) *~ config.cache config.h config.log config.status config.out)
-	@(cd $(srcdir); $(RMF) Makefile autoconf/Make.common)
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) $@ || exit 1); done
+	@for I in $(all_subdirs); do (cd $$I && $(RMF) startit stopit btraceback); done
+	@(cd $(srcdir) && $(RMF) *~ config.cache config.h config.log config.status config.out)
+	@(cd $(srcdir) && $(RMF) Makefile autoconf/Make.common)
 	@(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
 	@$(RMF) bacula fd Makefile startmysql stopmysql startit stopit btraceback
 	@$(RMF) bconsole gconsole
@@ -199,10 +212,10 @@ distclean:
 	@$(RMF) -rf txt diff src/python src/testprogs
 
 devclean:
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done
-	@for I in $(all_subdirs); do (cd $$I; $(RMF) startit stopit btraceback); done
-	@(cd $(srcdir); $(RMF) *~ config.cache config.h config.log config.status config.out)
-	@(cd $(srcdir); $(RMF) Makefile autoconf/Make.common)
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) $@ || exit 1); done
+	@for I in $(all_subdirs); do (cd $$I && $(RMF) startit stopit btraceback); done
+	@(cd $(srcdir) && $(RMF) *~ config.cache config.h config.log config.status config.out)
+	@(cd $(srcdir) && $(RMF) Makefile autoconf/Make.common)
 	@(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
 	@$(RMF) bacula fd Makefile startmysql stopmysql startit stopit btraceback
 	@$(RMF) bconsole gconsole
@@ -212,12 +225,12 @@ devclean:
 distdirs:
 	mkdir ../$(VERNAME);
 	mkdir ../$(VERNAME)/autoconf;
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
 
 distcopy:
 	$(CP) -p $(DIST) ../$(VERNAME);
 	$(CP) -p $(DIST_CFG) ../$(VERNAME)/autoconf;
-	@for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 distrib: configure autoconf/config.h.in distdirs distcopy