Rename KDEHOME and KDEDIR

6 files changed, 21 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index c4477a1..ef16f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -334,7 +334,7 @@ Big parts of the audio project have been rewritten to have a way better design:
         - Allow multible sources for one track.
         - Split tracks, merge tracks.
         - Improved track dialog.
-K3b now always writes a logfile in $(KDEHOME)/share/apps/k3b/lastlog.log
+K3b now always writes a logfile in $(TDEHOME)/share/apps/k3b/lastlog.log
 New device configuration format which solves all issues with removable devices like USB.
 Copy CSS encrypted DVDs if libdvdcss is installed.
 Libsndfile decoder plugin. This includes support for AIFF audio files.
diff --git a/FAQ b/FAQ
index b97064e..3b8395b 100644
--- a/FAQ
+++ b/FAQ
@@ -4,8 +4,8 @@ Q: Compiling K3b fails with errors like this:
    base_k3badvanceddataimagesettings.h:17: forward declaration of `struct 
    KComboBox'
 A: The QTDesigner tool 'uic' is not able to find the kde widget plugins. 
-   To solve this run 'qtconfig' and add '$KDEDIR/lib/trinity/plugins' to the plugin search path 
-   (replace $KDEDIR with your kde base dir).
+   To solve this run 'qtconfig' and add '$TDEDIR/lib/trinity/plugins' to the plugin search path 
+   (replace $TDEDIR with your kde base dir).
 
 
 Q: K3b thinks my SCSI device is IDE.
@@ -18,7 +18,7 @@ A: If you are using the rpm from SuSE your version of K3bSetup is not able to se
 Q: Where has all the fancy graphic gone?
 A: Most likely you installed K3b in the wrong directory. All KDE programs are installed in the 
    KDE dirtree (SuSE: /opt/trinity, RedHat: /usr). If you compile K3b from source it defaults 
-   to either $KDEDIR or /usr/local. To install in the correct directory you need to specify the prefix 
+   to either $TDEDIR or /usr/local. To install in the correct directory you need to specify the prefix 
    to configure like this:
      ./configure --prefix=`kde-config --prefix`
    That will install K3b relative to the correct path.
diff --git a/acinclude.m4 b/acinclude.m4
index c51d429..fb1eb8b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -382,13 +382,13 @@ same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
 
         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"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            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
 		KDE_XSL_STYLESHEET=""
@@ -1818,7 +1818,7 @@ fi
 if test -z "$1"; then
 
 kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1830,7 +1830,7 @@ So, check this please and use another prefix!])
 fi
 
 kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -3574,7 +3574,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4973,12 +4973,12 @@ AC_DEFUN([KDE_CONF_FILES],
 
 dnl This sets the prefix, for arts and tdelibs
 dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -5002,7 +5002,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
diff --git a/configure.in b/configure.in
index 013a332..155603f 100644
--- a/configure.in
+++ b/configure.in
@@ -1222,7 +1222,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/doc/index.docbook b/doc/index.docbook
index 260c9e6..208262c 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -129,8 +129,8 @@ application work. -->
       <para>
         The QTDesigner tool <application>uic</application> is not able to find the kde widget plugins.
         To solve this run <application>qtconfig</application> and add
-        <filename class="directory">$<envar>KDEDIR</envar>/lib/trinity/plugins</filename> to the
-        plugin search path (replace $<envar>KDEDIR</envar> with your kde base dir).
+        <filename class="directory">$<envar>TDEDIR</envar>/lib/trinity/plugins</filename> to the
+        plugin search path (replace $<envar>TDEDIR</envar> with your kde base dir).
       </para>
     </answer>
   </qandaentry>
diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
index ed2f986..65dd83a 100644
--- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
+++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
@@ -17,7 +17,7 @@
 #define __KFILE_K3BPROJECTFILEPLUGIN_H__
 
 /**
- * Note: For further information look into <$KDEDIR/include/kfilemetainfo.h>
+ * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h>
  */
 #include <kfilemetainfo.h>