Changeset 1685

Timestamp:

07/15/08 11:11:21 (8 weeks ago)

Author:

bird

Message:

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

Location:

trunk/kBuild/units

Files:

• qt3.kmk (modified) (8 diffs)
• qt4.kmk (modified) (4 diffs)

trunk/kBuild/units/qt3.kmk

@@ -37 +37 @@
 endif
 PROPS_SINGLE +=
-PROPS_ACCUMULATE_R +=
+PROPS_ACCUMULATE_R += QT_IMAGES
 
 
@@ -43 +43 @@
 # The QT3 SDK.
 #
-# This is implemented here rather than in sdks/QT4.kmk to enforce the global USES.
+# This is implemented here rather than in sdks/QT3.kmk to enforce the global USES.
 # It also makes things easier to develop, with fewer files I mean.
 #
@@ -64 +64 @@
    else
     # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT3_LIB* stuff if it doesn't work.
-    PATH_SDK_QT3 := $(patsubst %/bin/qm2ts,%,$(firstword $(wildcard /usr/bin/qm2ts /usr/local/bin/qm2ts /usr/qt/3/bin/qm2ts)))
+    PATH_SDK_QT3 := $(patsubst %/bin/qm2ts,%,$(firstword $(wildcard /usr/bin/qm2ts /usr/local/bin/qm2ts /usr/qt/3/bin/qm2ts /usr/share/qt3/bin/qm2ts)))
     ifneq ($(PATH_SDK_QT3),)
      ifeq ($(PATH_SDK_QT3_INC),)
-      PATH_SDK_QT3_INC := $(patsubst %/private/qfiledefs_p.h,%,$(firstword $(wildcard $(PATH_SDK_QT3)/include/private/qfiledefs_p.h $(PATH_SDK_QT3)/include/qt3/private/qfiledefs_p.h)))
+      PATH_SDK_QT3_INC := $(patsubst %/private/qfiledefs_p.h,%,$(firstword $(wildcard $(PATH_SDK_QT3)/include/private/qfiledefs_p.h $(PATH_SDK_QT3)/include/qt3/private/qfiledefs_p.h /usr/include/qt3/private/qfiledefs_p.h)))
      endif
      ifeq ($(PATH_SDK_QT3_LIB.x86),)
@@ -73 +73 @@
         $(PATH_SDK_QT3)/lib32/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib32/libqt-mt$(SUFF_DLL) \
+        /usr/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib32/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib32/qt3/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
@@ -82 +86 @@
         $(PATH_SDK_QT3)/lib64/qt3/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/amd64/libqt-mt$(SUFF_DLL) \
+        /usr/lib64/libqt-mt$(SUFF_DLL) \
+        /usr/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib/amd64/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib64/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/amd64/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
@@ -92 +102 @@
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib/libqt-mt$(SUFF_DLL) \
+        /usr/lib/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/qt3/libqt-mt$(SUFF_DLL) \
         )))
       endif
@@ -100 +114 @@
   # Found it?
   ifeq ($(PATH_SDK_QT3),)
-   $(warning kBuild: Couldn't find the Qt4 headers and libaries...)
+   $(warning kBuild: Couldn't find the Qt3 headers and libaries...)
    PATH_SDK_QT3 := $(PATH_DEVTOOLS_TRG)/qt/not-found
   endif
@@ -246 +260 @@
 #
 #
-# Back to the Qt4 unit.
+# Back to the Qt3 unit.
 #
 #

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