From 48b8146529d3a41c8d47ecd92d54d3398a4ca127 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 16 May 2009 14:25:36 +0000
Subject: [PATCH] Create archivedir

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8835 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/Makefile.in                        | 1 +
 bacula/autoconf/Make.common.in            | 1 +
 bacula/autoconf/configure.in              | 2 +-
 bacula/configure                          | 2 +-
 bacula/src/qt-console/restore/restore.cpp | 2 +-
 bacula/technotes                          | 2 ++
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index b0ad08c524..2245a2a664 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -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); \
diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index aba79f4dbe..f5583695f7 100644
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -31,6 +31,7 @@ includedir = @includedir@
 sysconfdir = @sysconfdir@
 plugindir = @plugindir@
 scriptdir = @scriptdir@
+archivedir = @archivedir@
 mandir = @mandir@
 manext = 8
 
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index a98ac5ce4c..470c7288f4 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1183,7 +1183,7 @@ AC_SUBST(working_dir)
 dnl ------------------------------------------------------------------
 dnl If the user has not set archivedir, we set our default as /tmp
 dnl ------------------------------------------------------------------
-archive_dir=/tmp
+archivedir=/tmp
 AC_ARG_WITH(archivedir,
    AC_HELP_STRING([--with-archivedir=PATH], [specify path of SD archive directory]),
    [
diff --git a/bacula/configure b/bacula/configure
index 2d665a2dfa..06d1318fe8 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -27338,7 +27338,7 @@ fi
 
 
 
-archive_dir=/tmp
+archivedir=/tmp
 
 # Check whether --with-archivedir was given.
 if test "${with_archivedir+set}" = set; then
diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index d1d15d98d0..32c30a04bf 100644
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -42,7 +42,7 @@ static const int dbglvl = 100;
 
 restorePage::restorePage(int conn)
 {
-   Pmsg1(dbglvl, "Construcing restorePage Instance connection %i\n", conn);
+   Dmsg1(dbglvl, "Construcing restorePage Instance connection %i\n", conn);
    m_conn = conn;
    QStringList titles;
 
diff --git a/bacula/technotes b/bacula/technotes
index f46aa00734..e024cceca3 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,8 @@
           
 General:
 
+16May09
+kes  Create archivedir.
 15May09
 kes  Yet another attempt to get qmake to generate valid Makefiles
      that installs the binaries. It seems to require the binary to
-- 
2.39.5