- up to 1.5.4

[packages/VirtualBox.git] / VirtualBox-qt-paths.patch

--- Config.kmk.orig	2007-01-16 11:39:32.000000000 +0100
+++ Config.kmk	2007-01-18 14:32:24.000000000 +0100
@@ -838,10 +838,10 @@
 else
  VBOX_PATH_QT_HOST ?= $(QTDIR)
 endif
-VBOX_UIC      ?= $(VBOX_PATH_QT_HOST)/bin/uic$(HOSTSUFF_EXE)
-VBOX_MOC      ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE)
-VBOX_LUPDATE  ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
-VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
+VBOX_UIC      ?= /usr/bin/uic$(HOSTSUFF_EXE)
+VBOX_MOC      ?= /usr/bin/moc$(HOSTSUFF_EXE)
+VBOX_LUPDATE  ?= /usr/bin/lupdate$(HOSTSUFF_EXE)
+VBOX_LRELEASE ?= /usr/bin/lrelease$(HOSTSUFF_EXE)
 
 #
 # The linux kernel headers(/sources).
@@ -1441,7 +1441,7 @@
 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
 TEMPLATE_VBOXQTGUIEXE_INCS = \
 	$(VBOX_PATH_SDK)/include \
-	$(VBOX_PATH_QT)/include
+	/usr/include/qt
 
 ifeq ($(BUILD_TARGET),win)
  TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
@@ -1843,10 +1843,10 @@
 
  ifeq ($(BUILD_TARGET_ARCH),amd64)
   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
-	$(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
+	/usr/lib64 /usr/lib
  else
   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
-	$(VBOX_PATH_QT)/lib
+	/usr/lib
  endif
 
  ifeq ($(BUILD_TARGET),darwin)