|
From: <cn...@us...> - 2020-11-29 13:51:35
|
Revision: 1118
http://sourceforge.net/p/seq/svn/1118
Author: cn187
Date: 2020-11-29 13:51:32 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
More Qt auto-detection fixes
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/acinclude.m4
Modified: showeq/branches/pre_6_0_beta/acinclude.m4
===================================================================
--- showeq/branches/pre_6_0_beta/acinclude.m4 2020-11-29 13:15:47 UTC (rev 1117)
+++ showeq/branches/pre_6_0_beta/acinclude.m4 2020-11-29 13:51:32 UTC (rev 1118)
@@ -103,8 +103,9 @@
$QTDIR/bin \
$QTDIR/src/moc \
/usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt4/bin \
+ /usr/lib/arm-linux-gnueabihf/qt4/bin \
/usr/lib/*/qt4/bin \
/usr/lib/qt4/bin \
/usr/X11R6/bin/qt4 \
@@ -132,8 +133,9 @@
$QTDIR/bin \
$QTDIR/src/moc \
/usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt4/bin \
+ /usr/lib/arm-linux-gnueabihf/qt4/bin \
/usr/lib/*/qt4/bin \
/usr/lib/qt4/bin \
/usr/X11R6/bin/qt4 \
@@ -241,8 +243,9 @@
$QTDIR/bin \
$QTDIR/src/uic \
/usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt4/bin \
+ /usr/lib/arm-linux-gnueabihf/qt4/bin \
/usr/lib/*/qt4/bin \
/usr/lib64/*/qt4/bin \
/usr/bin \
@@ -650,7 +653,8 @@
/usr/qt/4/include \
/usr/include/qt4 \
/usr/include/${host_cpu}-${host_vendor}-${host_os}/qt4 \
- /usr/include/arm-linux-gnueabihf/qt4 \
+ /usr/include/${host_cpu}-${host_os}/qt4 \
+ /usr/include/arm-linux-gnueabihf/qt4 \
/usr/include/*/qt4 \
/usr/lib/qt4/include \
/usr/X11R6/include/X11/qt4 \
@@ -758,7 +762,8 @@
$QTLIB \
/usr/lib \
/usr/lib/${host_cpu}-${host_vendor}-${host_os} \
- /usr/lib/arm-linux-gnueabihf \
+ /usr/lib/${host_cpu}-${host_os} \
+ /usr/lib/arm-linux-gnueabihf \
/usr/local/qt4/lib \
/usr/qt/4/lib \
/usr/lib/qt4/lib \
@@ -785,7 +790,8 @@
$QTLIB \
/usr/lib64 \
/usr/lib/${host_cpu}-${host_vendor}-${host_os} \
- /usr/lib/arm-linux-gnueabihf \
+ /usr/lib/${host_cpu}-${host_os} \
+ /usr/lib/arm-linux-gnueabihf \
/usr/local/qt4/lib64 \
/usr/qt/4/lib64 \
/usr/lib/qt4/lib64 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|