diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 01:04:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 01:04:12 -0600 |
| commit | 4e7f0068a52f0b9de5611fb7750f213c3c7f62e8 (patch) | |
| tree | 1a37ae076d39a134711004c549860e621c99f6c0 | |
| parent | 10bae57b29c7f6b41212ec905df25f2ff6626670 (diff) | |
| download | admin-4e7f0068a52f0b9de5611fb7750f213c3c7f62e8.tar.gz admin-4e7f0068a52f0b9de5611fb7750f213c3c7f62e8.zip | |
Prefer Qt3 files in tqt3 directories over files in qt3 directories
| -rw-r--r-- | acinclude.m4.in | 8 | ||||
| -rwxr-xr-x | debianrules | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index f5d2839..076ed2c 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -324,7 +324,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC], fi if test "$kde_qtver" = "3"; then - qt_bindirs="/usr/share/qt3/bin $qt_bindirs" + qt_bindirs="/usr/share/tqt3/bin /usr/share/qt3/bin $qt_bindirs" fi if test "$kde_qtver" = "4"; then @@ -1349,7 +1349,7 @@ if test $kde_qtver = 4; then kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + kde_qt_dirs="$QTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi @@ -1608,7 +1608,7 @@ if test "$PKG_CONFIG" != "no" ; then qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" fi fi -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" +qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/tqt3 /usr/include/qt3 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" fi @@ -5945,7 +5945,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) +AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/tqt3/doc /usr/lib/qt3/doc /usr/lib/tqt3/doc/html /usr/lib/qt3/doc/html /usr/doc/tqt3/html /usr/doc/qt3/html /usr/doc/tqt3 /usr/doc/qt3 /usr/share/doc/tqt3-doc /usr/share/doc/qt3-doc /usr/share/tqt3/doc/html /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) diff --git a/debianrules b/debianrules index c28bc32..abe5379 100755 --- a/debianrules +++ b/debianrules @@ -12,7 +12,7 @@ $sysconfdir = "/etc"; $kde_includedir = "$kde_prefix/include/kde"; $infodir = "$kde_prefix/share/info"; $mandir = "$kde_prefix/share/man"; -$qtdir = "/usr/share/qt3"; +$qtdir = "/usr/share/tqt3"; $kde_cgidir = "$kde_prefix/lib/cgi-bin"; $kde_confdir = "$sysconfdir/trinity"; |