X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=1d4b15ad9ad94672d210e1c4f08874610cd84523;hb=c3bee859bccbc0348d26d86fab90152fcce448ab;hp=f53148cf684cf7be310644b985a8cd754bf213fa;hpb=e43f780242566c44d1281e8f2724948fb0b79442;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index f53148cf68..1d4b15ad9a 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -34,6 +34,9 @@ DIST_CFG = autoconf/aclocal.m4 autoconf/configure.in \
 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
 	autoconf/install-sh autoconf/mkinstalldirs
 
+doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
+	    INSTALL
+
 MKDIR = $(srcdir)/autoconf/mkinstalldirs
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
@@ -42,7 +45,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
 all: Makefile
 	@for I in ${all_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
 			    echo ""; echo "";)); \
 	done
 
@@ -53,7 +56,7 @@ depend:
 bacula-fd: Makefile	   
 	@for I in ${fd_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) all || (echo ""; echo ""; echo "	 ====== Error in `pwd` ======; \
+	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======; \
 			    echo ""; echo "";)); \
 	done
 
@@ -93,6 +96,8 @@ installdirs:
 	$(MKDIR) $(DESTDIR)$(sbindir)
 	$(MKDIR) $(DESTDIR)$(sysconfdir)
 	$(MKDIR) $(DESTDIR)$(scriptdir)
+	$(MKDIR) $(DESTDIR)$(docdir)
+	$(MKDIR) $(DESTDIR)$(archivedir)
 	-if test ! -d $(DESTDIR)$(working_dir) ; then \
 	   $(MKDIR) $(DESTDIR)$(working_dir); \
 	   chmod 770 $(DESTDIR)$(working_dir); \
@@ -130,6 +135,7 @@ install-menu-consolehelper: gnomedirs
 	ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
 
 install: installdirs
+	@for I in $(doc_files) ; do $(INSTALL_DATA) $$I $(DESTDIR)${docdir}; done
 	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 uninstall:
@@ -189,6 +195,8 @@ Makefiles:
 	 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)
+	(cd src/qt-console; \
+	 chmod 755 install_conf_file build-depkgs-qt-console)
 
 clean:
 	@for I in ${all_subdirs} ; \