Restore win32 dir from Branch-5.2 and update it

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 2080ba37b96d6aaae4709fefd5a4adb0ba31b3fc..1a80577e8764b5bb65ff519b2d779c4cfc0ef981 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,8 +1,8 @@
-# 
+#
 # Master Makefile
 #
-# Author: Kern Sibbald
-# License: LGPLv3
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
 #
 @MCOMMON@
 
@@ -13,8 +13,8 @@ dir_user=@dir_user@
 srcdir =       @srcdir@
 VPATH =        @srcdir@
 .PATH:         @srcdir@
-topdir = .
-thisdir = .
+topdir = @BUILD_DIR@
+thisdir = @BUILD_DIR@
 
 
 first_rule: all
@@ -35,8 +35,8 @@ 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
+doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \
+           LICENSE-FAQ LICENSE-FOSS INSTALL
 
 MKDIR = $(srcdir)/autoconf/mkinstalldirs
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -54,11 +54,12 @@ depend:
        @for I in ${all_subdirs}; \
          do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
        
-bacula-fd: Makefile       
+bacula-fd: Makefile    
        @for I in ${fd_subdirs}; \
          do (cd $$I; echo "==>Entering directory `pwd`"; \
-             $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
-                           echo ""; echo ""; false ) || false) || exit 1; \
+             $(MAKE) DESTDIR=$(DESTDIR) all || \
+             (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+              echo ""; echo ""; false ) || false) || exit 1; \
        done
 
 #-------------------------------------------------------------------------
@@ -106,15 +107,19 @@ installdirs:
        $(MKDIR) $(DESTDIR)$(scriptdir)
        $(MKDIR) $(DESTDIR)$(docdir)
        $(MKDIR) $(DESTDIR)$(archivedir)
+       $(MKDIR) $(DESTDIR)$(bsrdir)
+       $(MKDIR) $(DESTDIR)${logdir}
        -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); \
+          chown $(dir_user) $(DESTDIR)$(logdir); \
        fi
        -if test "x$(dir_group)" != "x" ; then \
           chgrp $(dir_group) $(DESTDIR)$(working_dir); \
+          chgrp $(dir_group) $(DESTDIR)$(logdir); \
        fi
 
 install: installdirs
@@ -125,16 +130,16 @@ uninstall:
        @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)
@@ -155,21 +160,18 @@ 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 bacula sbtraceback \
+           mtx-changer bconsole devel_bacula)
        (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 make_catalog_backup delete_catalog_backup)
-
+        chmod 755 create_bacula_database update_bacula_tables \
+          make_bacula_tables grant_bacula_privileges drop_bacula_tables \
+          drop_bacula_database make_catalog_backup delete_catalog_backup)
        @for I in @DB_BACKENDS@ ; do \
          (cd src/cats; \
-          chmod 755 create_$${I}_database update_$${I}_tables make_$${I}_tables; \
-          chmod 755 grant_$${I}_privileges drop_$${I}_tables drop_$${I}_database); \
+          chmod 755 create_$${I}_database update_$${I}_tables \
+             make_$${I}_tables grant_$${I}_privileges drop_$${I}_tables \
+             drop_$${I}_database); \
          done
-
        (cd src/qt-console; \
         chmod 755 install_conf_file build-depkgs-qt-console)
 
@@ -193,7 +195,7 @@ distclean:
        @$(RMF) bacula fd Makefile startmysql stopmysql startit stopit btraceback
        @$(RMF) bconsole gconsole
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
-       @$(RMF) working/* kerns-* 
+       @$(RMF) working/* kerns-*
        @$(RMF) -rf txt diff src/python src/testprogs
        @$(RMF) libtool
 
@@ -220,22 +222,4 @@ distcopy:
 
 distrib: configure autoconf/config.h.in distdirs distcopy
 
-test:
-
-
-tar.gz:  ../$(VERNAME).tar.gz
-../$(VERNAME).tar.gz:
-       (cd ..; tar cvf - $(VERNAME) | gzip -f9 > $(VERNAME).tar.gz)
-
-tar.Z: ../$(VERNAME).tar.Z
-../$(VERNAME).tar.Z:
-       (cd ..; tar cvf - $(VERNAME) | compress > $(VERNAME).tar.Z)
-
-tar.bz2: ../$(VERNAME).tar.bz2
-../$(VERNAME).tar.bz2:
-       (cd ..; tar cvf - $(VERNAME) | bzip2 -f9 > $(VERNAME).tar.bz2)
-
-uuencode: tar.gz
-       uuencode ../$(VERNAME).tar.gz $(VERNAME).tar.gz > ../$(VERNAME).tgz.uu
-
 # ------------------------------------------------------------------------