Always update Bacula date in manual

diff --git a/docs/Makefile b/docs/Makefile
index 00908a2148aef9afed6d5e6d804f19b09a3ed74c..844c70a8fa2067a7fe11da6af977fd1f838e1d34 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -4,9 +4,9 @@
 
 # autoconf/Make.common.in        -*- Makefile -*-
 # release date (man), LSM date, version number/name, current maintainer
-DATE="24 August 2005"
+DATE="07 September 2005"
 LSMDATE=@LSMDATE@
-VERSION=1.37.37
+VERSION=1.37.38
 VERNAME=bacula-$(VERSION)#
 MAINT=Kern Sibbald#
 MAINTEMAIL=<kern@sibbald.com>#
@@ -121,7 +121,7 @@ install:
 uninstall:
 #      -cd $(mandir); $(RMF) $(manprefix)bacula.$(manext)
 
-distribution:
+release:
        rm -rf bacula-doc-*
        mkdir -p bacula-doc-$(VERSION)
        cp -ap manual/bacula bacula-doc-$(VERSION)/web-manual
@@ -135,5 +135,5 @@ distribution:
        tar cvfz bacula-doc-$(VERSION).tar.gz bacula-doc-$(VERSION)
        rm -rf bacula-doc-$(VERSION)
        @echo " "
-       @echo "Distribution document is in: bacula-doc-$(VERSION).tar.gz"
+       @echo "Release document is in: bacula-doc-$(VERSION).tar.gz"
        @echo " "

diff --git a/docs/autoconf/configure.in b/docs/autoconf/configure.in
index 78eb7aaae9ab0f0414ebe9927472c3d5f1922658..b3c8d15627e3cc5cf36e852d09e92ef89063b8b2 100644 (file)
--- a/docs/autoconf/configure.in
+++ b/docs/autoconf/configure.in
@@ -91,6 +91,7 @@ AC_OUTPUT([    \
           autoconf/Make.common \
           Makefile \
           manual/Makefile \
+          manual/update_version \
           manual/version.tex \
           manual-de/Makefile \
           manual-de/version.tex \
@@ -104,6 +105,7 @@ AC_OUTPUT([    \
          [ ]
 )
 
+chmod 766 manual/update_version
 
 echo "
 Configuration on `date`:

diff --git a/docs/configure b/docs/configure
index f98d6dddecf1fad334263cf06fb9dd057d95dd54..ad6321595766d8e78ce180277f58fa5d36186683 100755 (executable)
--- a/docs/configure
+++ b/docs/configure
@@ -1768,7 +1768,7 @@ MCOMMON=./autoconf/Make.common
 
 
 
-                                                                                                                                  ac_config_files="$ac_config_files autoconf/Make.common Makefile manual/Makefile manual/version.tex manual-de/Makefile manual-de/version.tex manual-fr/Makefile manual-fr/version.tex developers/Makefile developers/version.tex bacula-web/Makefile bacula-web/version.tex $PFILES"
+                                                                                                                                            ac_config_files="$ac_config_files autoconf/Make.common Makefile manual/Makefile manual/update_version manual/version.tex manual-de/Makefile manual-de/version.tex manual-fr/Makefile manual-fr/version.tex developers/Makefile developers/version.tex bacula-web/Makefile bacula-web/version.tex $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2327,6 +2327,7 @@ do
   "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;;
+  "manual/update_version" ) CONFIG_FILES="$CONFIG_FILES manual/update_version" ;;
   "manual/version.tex" ) CONFIG_FILES="$CONFIG_FILES manual/version.tex" ;;
   "manual-de/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual-de/Makefile" ;;
   "manual-de/version.tex" ) CONFIG_FILES="$CONFIG_FILES manual-de/version.tex" ;;
@@ -2829,6 +2830,7 @@ if test "$no_create" != yes; then
 fi
 
 
+chmod 766 manual/update_version
 
 echo "
 Configuration on `date`:

diff --git a/docs/developers/version.tex b/docs/developers/version.tex
index 770fdddb747a82e9c9943ef91c144f5cb421aabe..abd3a22a0220dd8a4a1c704837245d8622d0fa30 100644 (file)
--- a/docs/developers/version.tex
+++ b/docs/developers/version.tex
@@ -1 +1 @@
-1.37.37 (24 August 2005)
+1.37.38 (07 September 2005)

diff --git a/docs/manual-de/version.tex b/docs/manual-de/version.tex
index 770fdddb747a82e9c9943ef91c144f5cb421aabe..abd3a22a0220dd8a4a1c704837245d8622d0fa30 100644 (file)
--- a/docs/manual-de/version.tex
+++ b/docs/manual-de/version.tex
@@ -1 +1 @@
-1.37.37 (24 August 2005)
+1.37.38 (07 September 2005)

diff --git a/docs/manual/.cvsignore b/docs/manual/.cvsignore
index 44b4938e92c62f8848001a04f0add6a58d2ebf3c..4b24023df8d9ec32a93f946d2b1d495b058c8220 100644 (file)
--- a/docs/manual/.cvsignore
+++ b/docs/manual/.cvsignore
@@ -1,3 +1,4 @@
+update_version
 imagename_translations
 developers
 developers.html

diff --git a/docs/manual/Makefile.in b/docs/manual/Makefile.in
index 1e87758cbcdc94d47248ca5547f609c2baec07a9..f37f6d3ce67d52bedc001eecbf6ed561dad8592b 100644 (file)
--- a/docs/manual/Makefile.in
+++ b/docs/manual/Makefile.in
@@ -25,6 +25,8 @@ bacula: tex web html dvipdf
 
 
 tex:
+       @./update_version
+       @echo "Making version `cat version.tex`"
        @cp -fp ${IMAGES}/hires/*.eps .
        @touch baculai-dir.tex baculai-fd.tex baculai-sd.tex \
             baculai-console.tex baculai-general.tex

diff --git a/docs/manual/configure.tex b/docs/manual/configure.tex
index 4e60ccc14b6c0d6694ae63ee74b56ba843cdaea3..1b87f22e0a6f1f81f7956498076817fd48bc7738 100644 (file)
--- a/docs/manual/configure.tex
+++ b/docs/manual/configure.tex
@@ -112,6 +112,8 @@ be illegal.
 \subsubsection*{Including other Configuration Files}
 \index[general]{Including other Configuration Files }
 \index[general]{Files!Including other Configuration }
+\index[general]{Using @ to include other files}
+\index[general{@{\bf filename}}
 \addcontentsline{toc}{subsubsection}{Including other Configuration Files}
 
 If you wish to break your configuration file into smaller pieces, you can do

diff --git a/docs/manual/do_echo b/docs/manual/do_echo
new file mode 100644 (file)
index 0000000..04b9f79
--- /dev/null
+++ b/docs/manual/do_echo
@@ -0,0 +1,6 @@
+#
+# Avoid that @VERSION@ and @DATE@ are changed by configure
+#  This file is sourced by update_version
+#
+echo "s%@VERSION@%${VERSION}%g" >${out}
+echo "s%@DATE@%${DATE}%g" >>${out}

diff --git a/docs/manual/fileset.tex b/docs/manual/fileset.tex
index 764c0feeed3efd18c4efb177aba600328e375ef0..2071f0e7e892e504e0abd18b4d39bb4ff8ad7b6c 100644 (file)
--- a/docs/manual/fileset.tex
+++ b/docs/manual/fileset.tex
@@ -542,9 +542,21 @@ Include {
    a program.  This program will be executed on the Director's machine at
    the time the Job starts (not when the Director reads the configuration
    file), and any output from that program will be assumed to be a list of
-   files or directories, one per line, to be included.  This allows you to
-   have a job that for example includes all the local partitions even if
-   you change the partitioning by adding a disk.  In general, you will need
+   files or directories, one per line, to be included.  
+
+   This allows you to
+   have a job that, for example, includes all the local partitions even if
+   you change the partitioning by adding a disk. The examples
+   below show you how to do this. However, please note two
+   things: 1. if you want the local filesystems, you probably
+   should be using the new {\bf fstype} directive, which was
+   added in version 1.36.3.  2. the exact syntax of the command
+   needed in the examples below is very system dependent. For 
+   example, on recent Linux systems, you may need to add the -P 
+   option, on FreeBSD systems, the options will be different as
+   well.
+
+   In general, you will need
    to prefix your command or commands with a {\bf sh -c} so that they are
    invoked by a shell.  This will not be the case if you are invoking a
    script as in the second example below.  Also, you must take care to

diff --git a/docs/manual/update_version.in b/docs/manual/update_version.in
new file mode 100644 (file)
index 0000000..2766245
--- /dev/null
+++ b/docs/manual/update_version.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Script file to update the Bacula version
+#
+out=/tmp/$$
+VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
+DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' @bacula@/src/version.h`
+. ./do_echo
+sed -f ${out} version.tex.in >version.tex
+rm -f ${out}

diff --git a/docs/manual/version.tex b/docs/manual/version.tex
index 770fdddb747a82e9c9943ef91c144f5cb421aabe..abd3a22a0220dd8a4a1c704837245d8622d0fa30 100644 (file)
--- a/docs/manual/version.tex
+++ b/docs/manual/version.tex
@@ -1 +1 @@
-1.37.37 (24 August 2005)
+1.37.38 (07 September 2005)