From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 8 Jun 2009 08:38:06 +0000 (+0000)
Subject: Attempt to get bat conf file installation to work with DESTDIR
X-Git-Tag: Release-3.0.2~176
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5a2de2673f9a5648705c237b1089d45b4012108;p=bacula%2Fbacula

Attempt to get bat conf file installation to work with DESTDIR

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

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 222d56ba1b..e8dba7612f 100644
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -12,7 +12,7 @@ CONFIG += qt debug @QWT@
 bins.path = /$(DESTDIR)@sbindir@
 bins.files = bat
 confs.path = /$(DESTDIR)@sysconfdir@
-confs.commands = DESTDIR="${DESTDIR}" ./install_conf_file   
+confs.commands = ./install_conf_file
 help.path = /$(DESTDIR)@htmldir@
 help.files = help/*.html images/status.png images/mail-message-new.png
 
diff --git a/bacula/src/qt-console/install_conf_file.in b/bacula/src/qt-console/install_conf_file.in
index e4a3b005f4..ab3592ce38 100755
--- a/bacula/src/qt-console/install_conf_file.in
+++ b/bacula/src/qt-console/install_conf_file.in
@@ -3,6 +3,7 @@
 sbindir=@sbindir@
 sysconfdir=@sysconfdir@
 INSTALL_CONFIG="@INSTALL@ -m 640"
+DESTDIR=`echo ${DESTDIR}`
 
 srcconf=bat.conf
 if  test -f ${DESTDIR}${sysconfdir}/${srcconf}; then
diff --git a/bacula/src/version.h b/bacula/src/version.h
index f8ed5ab082..66973bbabb 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "3.0.2"
-#define BDATE   "05 June 2009"
-#define LSMDATE "05Jun09"
+#define BDATE   "08 June 2009"
+#define LSMDATE "08Jun09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes b/bacula/technotes
index d3ba9c0381..535f7e6440 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,7 +2,9 @@
           
 General:
 
-05Jun09
+08Jun09
+kes  Attempt to get bat conf file installation to work with DESTDIR
+05uun09
 kes  Improve error messages when a migration sql query is used and correct
      the problem identified in bug #1303 with starting Job names
      containing spaces.