diff options
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | basket.spec | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | installer | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6f34a07..6925738 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4830,13 +4830,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 @@ -4853,7 +4853,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/basket.spec b/basket.spec index 203a86f..628f3f5 100644 --- a/basket.spec +++ b/basket.spec @@ -20,8 +20,8 @@ A note-taking application that makes it easy to write down ideas as you think, a %prep %setup -if [ "`kde-config --prefix`" ]; then - CONFIGURE_PREFIX="`kde-config --prefix`" +if [ "`tde-config --prefix`" ]; then + CONFIGURE_PREFIX="`tde-config --prefix`" elif [ "${TDEDIR}" ]; then CONFIGURE_PREFIX="${TDEDIR}" elif [ -d "/opt/kde" ]; then diff --git a/configure.in b/configure.in index c57bbc3..646583c 100644 --- a/configure.in +++ b/configure.in @@ -175,7 +175,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," @@ -57,19 +57,19 @@ else fi if [ $SYS_WIDE == 0 ]; then - prefix=`kde-config --localprefix --expandvars` + prefix=`tde-config --localprefix --expandvars` else - prefix=`kde-config --prefix --expandvars` + prefix=`tde-config --prefix --expandvars` fi # Uninstall of BasKet: if [ $WHAT_TO_DO == 3 ]; then # Search installed basket: - prefix=`kde-config --localprefix --expandvars` # First loacally + prefix=`tde-config --localprefix --expandvars` # First loacally if [ -f $prefix/bin/basket ]; then SYS_WIDE=0 else - prefix=`kde-config --prefix --expandvars` # And then system wide + prefix=`tde-config --prefix --expandvars` # And then system wide if [ -f $prefix/bin/basket ]; then SYS_WIDE=1 else |