From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 15 May 2009 10:31:40 +0000 (+0000)
Subject: Yet another attempt to get qmake to generate valid Makefiles
X-Git-Tag: Release-3.0.2~234
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c378237eb0ccbf0224b3d581290951186545012c;p=bacula%2Fbacula

Yet another attempt to get qmake to generate valid Makefiles
     that installs the binaries. It seems to require the binary to
     exist at qmake time

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index a1260c803e..a98ac5ce4c 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2966,6 +2966,7 @@ if test "${support_bat}" = "yes" ; then
   
    cd src/qt-console
    echo "Creating bat Makefile"
+   touch bat
    $QMAKEBIN
    make clean
    cd ${BUILD_DIR}
diff --git a/bacula/configure b/bacula/configure
index ebdd49d0f1..2d665a2dfa 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -45670,6 +45670,7 @@ if test "${support_bat}" = "yes" ; then
 
    cd src/qt-console
    echo "Creating bat Makefile"
+   touch bat
    $QMAKEBIN
    make clean
    cd ${BUILD_DIR}
diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 046bbad51e..89f76ea79b 100644
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -10,7 +10,7 @@
 CONFIG += qt debug @QWT@
 
 bins.path = /$(DESTDIR)@sbindir@
-bins.files = ./bat
+bins.files = bat
 confs.path = /$(DESTDIR)@sysconfdir@
 confs.commands = ./install_conf_file   
 help.path = /$(DESTDIR)@htmldir@
@@ -157,9 +157,7 @@ SOURCES += status/storstat.cpp
 HEADERS += util/fmtwidgetitem.h util/comboutil.h
 SOURCES += util/fmtwidgetitem.cpp util/comboutil.cpp
 
-INSTALLS = bins
-INSTALLS += confs
-INSTALLS += help
+INSTALLS = bins confs help
 
 QMAKE_EXTRA_TARGETS += depend
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 501b624e00..2cb0b8b848 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "3.0.2"
-#define BDATE   "14 May 2009"
-#define LSMDATE "14May09"
+#define BDATE   "15 May 2009"
+#define LSMDATE "15May09"
 
 #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 80762e6dbc..f46aa00734 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,10 @@
           
 General:
 
+15May09
+kes  Yet another attempt to get qmake to generate valid Makefiles
+     that installs the binaries. It seems to require the binary to
+     exist at qmake time :-(
 14May09
 kes  Apply fix to sql_cmds.c suggested by
      Ulrich Leodolter <ulrich.leodolter at obvsg.at>