diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-26 14:24:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-26 14:24:14 -0600 |
| commit | 1e5f9378a47b7a809f3027ae8f39ef5062825756 (patch) | |
| tree | 0ffb3f98826eff1197a65c851638f5e034242117 | |
| parent | 05d69037cede1f0db222b4dec81dda64f26fd8b3 (diff) | |
| download | admin-1e5f9378a47b7a809f3027ae8f39ef5062825756.tar.gz admin-1e5f9378a47b7a809f3027ae8f39ef5062825756.zip | |
Rename kde-config to tde-config
| -rw-r--r-- | acinclude.m4.in | 10 | ||||
| -rw-r--r-- | configure.in.bot.end | 2 | ||||
| -rw-r--r-- | cvs.sh | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index 5ad0e76..b3c8143 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -5491,13 +5491,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 @@ -5513,7 +5513,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.bot.end b/configure.in.bot.end index 76943e6..3c902f9 100644 --- a/configure.in.bot.end +++ b/configure.in.bot.end @@ -3,7 +3,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," @@ -555,9 +555,9 @@ for subdir in $dirs; do fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot + kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |