Changeset 1764 in kBuild for trunk

Timestamp:

Sep 7, 2008 6:11:36 PM (16 years ago)

Author:

bird

Message:

qt3: not everyeone has qm2ts (debian), so look for moc in places other than /usr/[local/]bin.

File:

• trunk/kBuild/units/qt3.kmk (modified) (3 diffs)

trunk/kBuild/units/qt3.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Qt 3 unit.
+# Qt 3.3.x unit.
 #
 
@@ -68 +68 @@
         /usr/lib64/qt-3.3/bin/qm2ts \
         /usr/qt/3/bin/qm2ts \
-        $(QTDIR)/bin/qm2ts \
+        $(if $(QTDIR),$(QTDIR)/bin/qm2ts) \
         /usr/bin/qm2ts \
         /usr/local/bin/qm2ts \
         /usr/share/qt3/bin/qm2ts \
         )))
+    ifeq ($(PATH_SDK_QT3),) # Try with moc, but not in /usr/bin and /usr/local/bin.
+     PATH_SDK_QT3 := $(patsubst %/bin/moc,%,$(firstword $(wildcard \
+        /usr/lib/qt-3.3/bin/moc \
+        /usr/lib64/qt-3.3/bin/moc \
+        /usr/qt/3/bin/moc \
+        /usr/share/qt3/bin/moc \
+        $(if $(QTDIR),$(QTDIR)/bin/moc) \
+        )))
+    endif
     ifneq ($(PATH_SDK_QT3),)
      ifeq ($(PATH_SDK_QT3_INC),)
@@ -167 +176 @@
  ifeq ($(PATH_TOOL_QT3),)
   PATH_TOOL_QT3 := $(patsubst %/bin/qm2ts,%,$(firstword $(wildcard \
-        /usr/lib/qt-3.3/bin/qm2ts \
-        /usr/lib64/qt-3.3/bin/qm2ts \
-        /usr/qt/3/bin/qm2ts \
-        $(QTDIR)/bin/qm2ts \
-        /usr/bin/qm2ts \
-        /usr/local/bin/qm2ts \
-        /usr/share/qt3/bin/qm2ts \
-        )))
+        /usr/lib/qt-3.3/bin/qm2ts \
+        /usr/lib64/qt-3.3/bin/qm2ts \
+        /usr/qt/3/bin/qm2ts \
+        $(if $(QTDIR),$(QTDIR)/bin/qm2ts) \
+        /usr/bin/qm2ts \
+        /usr/local/bin/qm2ts \
+        /usr/share/qt3/bin/qm2ts \
+        )))
+  ifeq ($(PATH_SDK_QT3),) # Try with moc, but not in /usr/bin and /usr/local/bin.
+   PATH_TOOL_QT3 := $(patsubst %/bin/moc,%,$(firstword $(wildcard \
+        /usr/lib/qt-3.3/bin/moc \
+        /usr/lib64/qt-3.3/bin/moc \
+        /usr/qt/3/bin/moc \
+        /usr/share/qt3/bin/moc \
+        $(if $(QTDIR),$(QTDIR)/bin/moc) \
+        )))
+  endif
  endif
  # If not found, we'll enter the 'pathless' mode.