Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index b0ad08c524c222fbc4924748e2b4c0c39e93707d..38b154338d731ec77a1f06ca5afa89d763018085 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -20,7 +20,7 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
        src/console src/plugins/fd
 
 # Non-client-only directores
@@ -45,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
 
@@ -56,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
 
@@ -97,6 +97,7 @@ installdirs:
        $(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); \