diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | developer-doc/phb/rpm-example.docbook | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -5695,7 +5695,7 @@ * Applied fix-compile-visibility patch by Laurent Montel * Updated acinclude.m4.in and cvs.sh from KDE/admin * Pick up unusual places for the KDE basedir (e.g. /usr/lib/kde/3.3) - * Allow generation of pot file even if kde-config --install include + * Allow generation of pot file even if tde-config --install include returns NONE 2005-06-13 Thomas Baumgart <ipwizard@users.sourceforge.net> diff --git a/acinclude.m4 b/acinclude.m4 index d90dd47..98acd61 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share `kde-config --prefix`/share" + kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share `tde-config --prefix`/share" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then @@ -4983,13 +4983,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 @@ -5006,7 +5006,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 1a8dd02..b59d59c 100644 --- a/configure.in +++ b/configure.in @@ -342,7 +342,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/developer-doc/phb/rpm-example.docbook b/developer-doc/phb/rpm-example.docbook index 213e1ec..4b93fc4 100644 --- a/developer-doc/phb/rpm-example.docbook +++ b/developer-doc/phb/rpm-example.docbook @@ -45,7 +45,7 @@ This appendix contains an example of an RPM SPEC file. %define qt_path /usr/lib/qt3 %define distver %(release="`rpm -q --queryformat='%{VERSION}' %{dist}-release 2> /dev/null | tr . : | sed s/://g`" ; if test $? != 0 ; then release="" ; fi ; echo "$release") -%define distlibsuffix %(%_bindir/kde-config --libsuffix 2>/dev/null) +%define distlibsuffix %(%_bindir/tde-config --libsuffix 2>/dev/null) %define _lib lib%distlibsuffix %define packer %(finger -lp `echo "$USER"` | head -n 1 | cut -d: -f 3) |