diff --git a/configure b/configure index aa568843..4ebf56c6 100755 --- a/configure +++ b/configure @@ -536,7 +536,12 @@ if [ -z "$QTDIR" ]; then if [ $? -eq 0 ]; then QMAKE_BIN=`which qmake` else - echo "qmake was not found in your path\n" + which qmake-qt5 > /dev/null + if [ $? -eq 0 ]; then + QMAKE_BIN=`which qmake-qt5` + else + echo "qmake was not found in your path\n" + fi fi elif [ -f "$QTDIR/bin/qmake" ]; then QMAKE_BIN="$QTDIR/bin/qmake" diff --git a/rpm/libmlocale-qt5.spec b/rpm/libmlocale-qt5.spec index 2004d474..d54c8873 100644 --- a/rpm/libmlocale-qt5.spec +++ b/rpm/libmlocale-qt5.spec @@ -57,7 +57,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} export QT_SELECT=5 -%make_install +%make_install INSTALL_ROOT=%{buildroot} %post -p /sbin/ldconfig diff --git a/tests/tests.pro b/tests/tests.pro index af894ebc..8cd3e148 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -18,7 +18,9 @@ contains(DEFINES, HAVE_ICU) { SUBDIRS += \ ft_breakiterator \ ft_locales \ - ft_localedata \ + \ ## commented out as genrb is packaged separately in Fedora + \ ## and this test is mainly focussed on ICU, but not mlocale + \ # ft_localedata \ ft_mlocalebuckets \ ft_numbers \ ft_sorting \