Changeset 2787 in kBuild

Timestamp:

Aug 13, 2015 9:16:00 AM (9 years ago)

Author:

bird

Message:

units/qt4.kmk: look for -qt4 suffixed binaries too when locating the SDK.

File:

• trunk/kBuild/units/qt4.kmk (modified) (1 diff)

trunk/kBuild/units/qt4.kmk

@@ -80 +80 @@
     # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
     # Try find the general root of thing by looking for the qt3to4 program, if not found, then look for rcc.
-    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 \
+    PATH_SDK_QT4 := $(patsubst %/bin/qt3to4-qt4,%,$(firstword $(wildcard \
+        /usr/bin/qt3to4-qt4 \
+        /usr/local/bin/qt3to4-qt4 \
+        /usr/qt/4/bin/qt3to4-qt4 \
+        /usr/share/qt4/bin/qt3to4-qt4 \
         )))
+    ifeq ($(PATH_SDK_QT4),)
+     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 \
+        )))
+    endif
+    ifeq ($(PATH_SDK_QT4),)
+     PATH_SDK_QT4 := $(patsubst %/bin/rcc-qt4,%,$(firstword $(wildcard \
+        /usr/bin/rcc-qt4 \
+        /usr/local/bin/rcc-qt4 \
+        /usr/qt/4/bin/rcc-qt4 \
+        /usr/share/qt4/bin/rcc-qt4 \
+        )))
+    endif
     ifeq ($(PATH_SDK_QT4),)
      PATH_SDK_QT4 := $(patsubst %/bin/rcc,%,$(firstword $(wildcard \
         /usr/bin/rcc \
-        /usr/local/bin/rcc \
+        /usr/local/bin/rcc \
         /usr/qt/4/bin/rcc \
         /usr/share/qt4/bin/rcc \
-        )))
+        )))
     endif
     ifneq ($(PATH_SDK_QT4),)