Browse Source

Rename kde-config to tde-config

master
Timothy Pearson 11 years ago
parent
commit
051b780803
  1. 10
      acinclude.m4
  2. 2
      configure.in
  3. 6
      kuickshow/kuickshow.spec

10
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

2
configure.in

@ -178,7 +178,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,"

6
kuickshow/kuickshow.spec

@ -31,7 +31,7 @@ It is fully configurable through dialogs.
Besides that, it offers a nice filebrowser with basic filemanager capabilities
like renaming, deleting, creating directories, ...
Install with '--prefix $TDEDIR' unless you have the kde-config program.
Install with '--prefix $TDEDIR' unless you have the tde-config program.
%prep
rm -rf $RPM_BUILD_ROOT
@ -40,9 +40,9 @@ rm -rf $RPM_BUILD_ROOT
%build
PREFIX=""
which kde-config || PREFIX=%{prefix}
which tde-config || PREFIX=%{prefix}
if test -z "$PREFIX"; then
PREFIX=`kde-config --prefix`
PREFIX=`tde-config --prefix`
fi
export TDEDIR="$PREFIX"

Loading…
Cancel
Save