From 80c4d8b5a67d8457eec2400245d6cd66cb8750d4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 26 Feb 2012 14:21:13 -0600 Subject: [PATCH] Rename kde-config to tde-config --- acinclude.m4 | 10 +++++----- configure.in | 2 +- konversation/scripts/sysinfo | 2 +- konversation/scripts/tdeversion | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c36a852..f7088fc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4994,13 +4994,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 @@ -5016,7 +5016,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 43b6ae6..2135ff1 100644 --- a/configure.in +++ b/configure.in @@ -192,7 +192,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/konversation/scripts/sysinfo b/konversation/scripts/sysinfo index d8d25c5..c956c27 100644 --- a/konversation/scripts/sysinfo +++ b/konversation/scripts/sysinfo @@ -20,7 +20,7 @@ if [ "$TDE_FULL_SESSION" = "true" ]; then if [ "$TDE_SESSION_VERSION" = 4 ]; then KDE="$(kde4-config --version | sed -n '2p' | sed 's/://;s/ *$//')" else - KDE="$(kde-config --version | sed -n '2p' | sed 's/://;s/ *$//')" + KDE="$(tde-config --version | sed -n '2p' | sed 's/://;s/ *$//')" fi fi diff --git a/konversation/scripts/tdeversion b/konversation/scripts/tdeversion index 34fef02..cc6ac55 100755 --- a/konversation/scripts/tdeversion +++ b/konversation/scripts/tdeversion @@ -6,4 +6,4 @@ PORT=$1; SERVER=$2; TARGET=$3; -kde-config --version | while read line; do dcop $PORT default say $SERVER "$TARGET" "$line"; done +tde-config --version | while read line; do dcop $PORT default say $SERVER "$TARGET" "$line"; done