diff --git a/INSTALL b/INSTALL index 9b4ad9c..225d042 100644 --- a/INSTALL +++ b/INSTALL @@ -377,7 +377,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. Assuming Krusader is not the only Qt™/KDE program you want to compile, we recommend to make these settings permanent (e.g. append both export commands to your /etc/profile) file. - If you can notdetermine your TDEDIR, kde-config --prefix might help you. + If you can notdetermine your TDEDIR, tde-config --prefix might help you. 8. If you have downloaded a stable version "krusader-x.xx.tar.gz" or a beta version "krusader-x.xx-betax.tar.gz", you can skip this step. In this case the ./configure script is provided. @@ -465,7 +465,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. Krusader sources. If you used another --prefix= than $TDEDIR or /usr/local, it is recommended to do an extra check: - $ kde-config --path exe + $ tde-config --path exe /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ $ If the directory is not shown, you need to use e.g. diff --git a/acinclude.m4 b/acinclude.m4 index 7fa72e3..99d8547 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4981,13 +4981,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 @@ -5003,7 +5003,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 a55d204..5bb53f8 100644 --- a/configure.in +++ b/configure.in @@ -235,7 +235,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/doc/en/installation.docbook b/doc/en/installation.docbook index 478e8d9..30e97f7 100644 --- a/doc/en/installation.docbook +++ b/doc/en/installation.docbook @@ -655,7 +655,7 @@ Please don't use the /usr/local directory as it simply won' file. If you can notdetermine your TDEDIR, - kde-config --prefix might help + tde-config --prefix might help you. @@ -817,7 +817,7 @@ Good - your configure finished. Start make now If you used another --prefix= than $TDEDIR or /usr/local, it is recommended to do an extra check: -$ kde-config +$ tde-config /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ $ If the diff --git a/doc/en/useractions.docbook b/doc/en/useractions.docbook index 2c3b5fd..72e5129 100644 --- a/doc/en/useractions.docbook +++ b/doc/en/useractions.docbook @@ -550,9 +550,9 @@ <kde-app-data>/krusader/js/. <kde-app-data> is - $(kde-config + $(tde-config --localprefix)/share/apps/ or - $(kde-config --prefix)/share/apps/, + $(tde-config --prefix)/share/apps/, for those who don't know where to copy the scripts/extensions. If all the needed files (normally .js and maybe diff --git a/doc/ru/installation.docbook b/doc/ru/installation.docbook index 064dc04..b9c88a0 100644 --- a/doc/ru/installation.docbook +++ b/doc/ru/installation.docbook @@ -565,7 +565,7 @@ If you can't determine your TDEDIR than kde-config --prefixtde-config --prefix might help you. @@ -739,7 +739,7 @@ Good - your configure finished. Start make now >If you dit use the an other --prefix= than $TDEDIR or /usr/local , then it can't hurt to do an extra check: $ kde-config +>$ tde-config /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ $ If the <prefix_dir/bin> directory is not shown, you need to use e.g. &useraction_parameter; path to the external foo.js file, absolut path or relative to <kde-app-data>/krusader/js/. <kde-app-data> is $(kde-config --localprefix)/share/apps/$(tde-config --localprefix)/share/apps/ or $(kde-config --prefix)/share/apps/$(tde-config --prefix)/share/apps/, for those who don't know where so copy the scripts/extensions. If all the needed files (normaly .js and maybe