diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -86,7 +86,7 @@ Installation for KDE3: was wrong. Check where your KDE3 installation is located and use that directory with the prefix-option of configure. - This command should tell you: kde-config --prefix + This command should tell you: tde-config --prefix For SuSE and most distributions the prefix usually is /opt/trinity. For Redhat/Fedora and Mandrake the prefix usually is /usr. @@ -101,7 +101,7 @@ Installation for KDE3: (rm -R `find $TDEHOME -name "*kdiff3*" -not -name "kdiff3*rc"`) On Fedora-64-bit systems the following configure-line was reported to work: - ./configure --prefix=`kde-config --prefix` --enable-libsuffix=64 --with-qt-libraries=/usr/lib64/qt-3.3/lib/ + ./configure --prefix=`tde-config --prefix` --enable-libsuffix=64 --with-qt-libraries=/usr/lib64/qt-3.3/lib/ Both --enable-libsuffix=64 and -with-qt-libraries=/usr/lib64/qt-3.3/lib/ are needed; without the first one it fails to find the KDE libraries, and without the second one it fails to find libqt-mt diff --git a/acinclude.m4 b/acinclude.m4 index b12c5f7..abcab60 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4982,13 +4982,13 @@ AC_DEFUN([KDE_SET_PREFIX], KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi @@ -5004,7 +5004,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix diff --git a/configure.in b/configure.in index cb0c670..e03ff17 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 7c12306..0e08a53 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -101,7 +101,7 @@ INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCONFIG_COMPILER = /usr/bin/kconfig_compiler -KDECONFIG = /usr/bin/kde-config +KDECONFIG = /usr/bin/tde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = KDE_INCLUDES = -I/usr/include/tde |