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 222d56ba1b0c09f4d4534c003a36d8cc12a51732..e8dba7612fa7b4b7be809f0a02e60aa76ea7034a 100644 (file)
--- 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 e4a3b005f4a7d09ca458c54bcb13044804b83d68..ab3592ce38b6e1153c5093d3253893a4cf8da808 100755 (executable)
--- 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 f8ed5ab082baf74ef624fd21125e3162ebd42730..66973bbabbbab0dfbb8e07bcc8144438632396ce 100644 (file)
--- 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 d3ba9c0381b95f71b2bb418533d29b9a402f2db6..535f7e6440f81d006fbab6a749c4057a102ffb32 100644 (file)
--- 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.