From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 31 Mar 2009 11:13:58 +0000 (+0000)
Subject: use /usr/share/doc/bacula for technotes
X-Git-Tag: Release-7.0.0~3190
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ddb790fe6ec96163946fd613b5cdff16d5a57698;p=bacula%2Fbacula

use /usr/share/doc/bacula for technotes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8665 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 2a0fb04578..a3c703cd80 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -277,11 +277,11 @@ if test x$mandir = x'${prefix}/man' ; then
 fi
 
 dnl -------------------------------------------------------------------------
-dnl  If the user has not set --htmldir, we default to /usr/share/doc/bacula-xx.xx/html
+dnl  If the user has not set --htmldir, we default to /usr/share/doc/bacula/html
 dnl -------------------------------------------------------------------------
 dnl z
 if test x$htmldir = x${docdir} ; then
-   htmldir=`eval echo ${docdir}bacula-${VERSION}/html`
+   htmldir=`eval echo ${docdir}bacula/html`
 fi
 
 dnl -------------------------------------------------------------------------
@@ -289,7 +289,7 @@ dnl  If the user has not set --docdir, we default to /usr/share/doc/
 dnl -------------------------------------------------------------------------
 dnl z
 if test x$docdir = x'/usr/share/doc/' ; then
-   docdir=`eval echo ${docdir}bacula-${VERSION}`
+   docdir=`eval echo ${docdir}bacula`
 fi
 
 	    
diff --git a/bacula/configure b/bacula/configure
index 15899f9ed8..38ff0f5363 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -18365,11 +18365,11 @@ if test x$mandir = x'${prefix}/man' ; then
 fi
 
 if test x$htmldir = x${docdir} ; then
-   htmldir=`eval echo ${docdir}bacula-${VERSION}/html`
+   htmldir=`eval echo ${docdir}bacula/html`
 fi
 
 if test x$docdir = x'/usr/share/doc/' ; then
-   docdir=`eval echo ${docdir}bacula-${VERSION}`
+   docdir=`eval echo ${docdir}bacula`
 fi
 
 
diff --git a/bacula/technotes b/bacula/technotes
index e1bde67bdc..6ec4355a9f 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -11,14 +11,14 @@ kes  Add code to FD plugin driver to make a copy of the plugin
 kes  Directly mark all files saved by plugin as being seen for Accurate.
 kes  Add checks on the plugin version and the plugin license. Currently
      only implemented for FD plugins.
-kes  Add installation of /usr/share/doc/bacula-VERSION
+kes  Add installation of /usr/share/doc/bacula
 kes  Modify plugin checkFile to return bRC_Seen to cause file
      to remain.  Previously was true/false.
 27Mar09
 kes  Implement installation of bat help files
      The help files are installed in the htmldoc dir and can be set
      by --htmldoc=xxx on the ./configure. Default is:
-     /usr/share/doc/bacula-version/html
+     /usr/share/doc/bacula/html
 kes  Update projects file
 kes  Apply patch from  Pasi Karkkainen <pasik@iki.fi> that adds
      Previous Job name to migrate job report.