Changeset 1685 for trunk/kBuild/units/qt4.kmk

Timestamp:

Jul 15, 2008, 11:11:21 AM (17 years ago)

Author:

bird

Message:

Look for qt in more places (hopefully fixes some ubuntu issues).

File:

• trunk/kBuild/units/qt4.kmk (modified) (4 diffs)

trunk/kBuild/units/qt4.kmk

@@ -62 +62 @@
    else
     # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
-    PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard /usr/bin/qt3to4 /usr/local/bin/qt3to4 /usr/qt/4/bin/qt3to4)))
+    PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard /usr/bin/qt3to4 /usr/local/bin/qt3to4 /usr/qt/4/bin/qt3to4 /usr/share/qt4/bin/qt3to4)))
     ifneq ($(PATH_SDK_QT4),)
      ifeq ($(PATH_SDK_QT4_INC),)
-      PATH_SDK_QT4_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard $(PATH_SDK_QT4)/include/QtCore/qglobal.h $(PATH_SDK_QT4)/include/qt4/QtCore/qglobal.h)))
+      PATH_SDK_QT4_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard $(PATH_SDK_QT4)/include/QtCore/qglobal.h $(PATH_SDK_QT4)/include/qt4/QtCore/qglobal.h /usr/include/qt4/QtCore/qtglobal.h)))
      endif
      ifeq ($(PATH_SDK_QT4_LIB.x86),)
@@ -71 +71 @@
         $(PATH_SDK_QT4)/lib32/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib32/qt4/libQtCore$(SUFF_DLL) \
+        /usr/lib32/libQtCore$(SUFF_DLL) \
+        /usr/lib32/qt4/libQtCore$(SUFF_DLL) \
+        /usr/local/lib32/libQtCore$(SUFF_DLL) \
+        /usr/local/lib32/qt4/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
@@ -80 +84 @@
         $(PATH_SDK_QT4)/lib64/qt4/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/amd64/libQtCore$(SUFF_DLL) \
+        /usr/lib64/libQtCore$(SUFF_DLL) \
+        /usr/lib64/qt4/libQtCore$(SUFF_DLL) \
+        /usr/lib/amd64/libQtCore$(SUFF_DLL) \
+        /usr/local/lib64/libQtCore$(SUFF_DLL) \
+        /usr/local/lib64/qt4/libQtCore$(SUFF_DLL) \
+        /usr/local/lib/amd64/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
@@ -90 +100 @@
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+        /usr/lib/libQtCore$(SUFF_DLL) \
+        /usr/lib/qt4/libQtCore$(SUFF_DLL) \
+        /usr/local/lib/libQtCore$(SUFF_DLL) \
+        /usr/local/lib/qt4/libQtCore$(SUFF_DLL) \
         )))
       endif