Rename KDEHOME and KDEDIR

4 files changed, 17 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index a4fe6b2..758c38c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,7 @@
                   Thanks Laurent!!
 
 2005-03-23 (0.5): Theme adding now possible! (code borrowed from kcmicon)
-                  Known limitation currently is if you don't have a $KDEDIR/share/apps/kdm/themes/
+                  Known limitation currently is if you don't have a $TDEDIR/share/apps/kdm/themes/
                   then the install will fail the first time but will be successful the 2nd time.
 
 2005-03-23 (0.6): Applied another patch from Laurent to fix a potential memory leak.
@@ -74,7 +74,7 @@
 2006-01-30 (1.0.1): When inserting a theme configChanged() was not run.
 
 2006-02-23 (1.1): Applied a patch from Jonathan Patrick Davies to fix an i18n/l10n issue.
-                  Removed Themes Variable in the kdmrc (kdm devs didn't like it :) The problem with removing this however is you can now no longer "insert" themes, instead they all must be your $KDEDIR/share/kdm/themes dir. If you have always used kdmtheme to install themes and not insert them, you'll not need to worry. This will also mean that your list can now never be lost! (unless of course you lose your themes directory.) Also being that this list is now auto generated if you remove a theme be sure to check "remove from hard drive" if you don't want it to show up again on the next load.
+                  Removed Themes Variable in the kdmrc (kdm devs didn't like it :) The problem with removing this however is you can now no longer "insert" themes, instead they all must be your $TDEDIR/share/kdm/themes dir. If you have always used kdmtheme to install themes and not insert them, you'll not need to worry. This will also mean that your list can now never be lost! (unless of course you lose your themes directory.) Also being that this list is now auto generated if you remove a theme be sure to check "remove from hard drive" if you don't want it to show up again on the next load.
                   Updated address for the GPL license to match that found in KDE.
 
 2006-06-20 (1.1.1): Fixed 2 crashes 1 where no themes were found in your theme directory
diff --git a/acinclude.m4 b/acinclude.m4
index 7ef33a5..faf1553 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
@@ -608,7 +608,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
 
         if test -n "$MEINPROC" && test ! "$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=""
@@ -1795,7 +1795,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"
@@ -1807,7 +1807,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"
@@ -3371,7 +3371,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
@@ -4767,12 +4767,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
@@ -4796,7 +4796,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 ad7a0cb..406a8ba 100644
--- a/configure.in
+++ b/configure.in
@@ -86,7 +86,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/en/index.docbook b/doc/en/index.docbook
index 6f5038f..dc02f7d 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -195,7 +195,7 @@ application work. -->
 			<para>I don't see any themes what's wrong?!</para>
 		</question>
 		<answer>
-			<para>First make sure you didn't 'insert' any themes those are not saved only themes that appear in your theme directory are used. Next check your theme directory it should be located in your $KDEDIR/share/apps/kdm/themes/</para>
+			<para>First make sure you didn't 'insert' any themes those are not saved only themes that appear in your theme directory are used. Next check your theme directory it should be located in your $TDEDIR/share/apps/kdm/themes/</para>
 		</answer>
 	</qandaentry>
 </qandaset>