From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 29 Oct 2009 15:06:26 +0000 (+0100)
Subject: Make bat win32 build use /home/kern/bacula
X-Git-Tag: Release-7.0.0~2598^2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ddd2c2b0f46c8b1723fe0fe9f4ff246e4af0b306;p=bacula%2Fbacula

Make bat win32 build use /home/kern/bacula
---

diff --git a/bacula/src/qt-console/win32/qmake.conf b/bacula/src/qt-console/win32/qmake.conf
index 0799397f31..2d19b18e5a 100644
--- a/bacula/src/qt-console/win32/qmake.conf
+++ b/bacula/src/qt-console/win32/qmake.conf
@@ -14,7 +14,7 @@ QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
 QMAKE_EXT_OBJ           = .o
 QMAKE_EXT_RES           = _res.o
 
-QMAKE_CC                = ../../../cross-tools/mingw32/bin/mingw32-gcc
+QMAKE_CC                = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-gcc
 QMAKE_LEX               = flex
 QMAKE_LEXFLAGS          =
 QMAKE_YACC              = byacc
@@ -27,7 +27,7 @@ QMAKE_CFLAGS_RELEASE    = -O2
 QMAKE_CFLAGS_DEBUG      = -g
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
 
-QMAKE_CXX               = ../../../cross-tools/mingw32/bin/mingw32-g++
+QMAKE_CXX               = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-g++
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -DHAVE_MINGW -DHAVE_WIN32 -DHAVE_ZLIB_H -DHAVE_LIBZ -DHAVE_CRYPTO -DHAVE_OPENSSL -DHAVE_TLS 
 QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
@@ -41,16 +41,16 @@ QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
-QMAKE_INCDIR            = ../../../depkgs-mingw32/include/pthreads ../../../depkgs-mingw32/include/ ../win32/compat 
-QMAKE_INCDIR_QT         = ../../../depkgs-mingw32/include/qt
-QMAKE_LIBDIR_QT         = ../../../depkgs-mingw32/lib/qt
+QMAKE_INCDIR            = $(DEPKGS)/depkgs-mingw32/include/pthreads $(DEPKGS)/depkgs-mingw32/include/ ../win32/compat 
+QMAKE_INCDIR_QT         = $(DEPKGS)/depkgs-mingw32/include/qt
+QMAKE_LIBDIR_QT         = $(DEPKGS)/depkgs-mingw32/lib/qt
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-QMAKE_LINK              = ../../../cross-tools/mingw32/bin/mingw32-g++
+QMAKE_LINK              = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-g++
 QMAKE_LFLAGS            = -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import  -mno-cygwin -m32 -fno-strict-aliasing -Wl,-enable-runtime-pseudo-reloc
 
 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
@@ -88,10 +88,10 @@ QMAKE_UIC               = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic
 QMAKE_IDC               = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc
 
 QMAKE_IDL               = midl
-QMAKE_LIB               = ../../../cross-tools/mingw32/bin/mingw32-ar -ru
-QMAKE_RC                = ../../../cross-tools/mingw32/bin/mingw32-windres
+QMAKE_LIB               = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-ar -ru
+QMAKE_RC                = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-windres
 QMAKE_ZIP               = zip -r -9
 
-QMAKE_STRIP             = ../../../cross-tools/mingw32/bin/mingw32-strip
+QMAKE_STRIP             = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-strip
 QMAKE_STRIPFLAGS_LIB    += --strip-unneeded
 load(qt_config)