Rename KDEHOME and KDEDIR

4 files changed, 26 insertions, 26 deletions

diff --git a/INSTALL b/INSTALL
index 4cc16f2..3c9ac2c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Dependencies:
 - Autoconf 2.5
 - Automake 1.6
 
-You'll also need to have your $KDEDIR environment variable set correctly.
+You'll also need to have your $TDEDIR environment variable set correctly.
 
 
 Installing from Tarball Distribution:
diff --git a/acinclude.m4 b/acinclude.m4
index fe82481..8151d5b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -377,13 +377,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)
@@ -524,11 +524,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
 [
 
         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
@@ -543,7 +543,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=""
@@ -1663,7 +1663,7 @@ fi
 if test -z "$1"; then
 
 kde_incdirs="/opt/trinity/include/kde /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"
@@ -1675,7 +1675,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"
@@ -2997,7 +2997,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
@@ -4581,8 +4581,8 @@ AC_DEFUN(KDE_CONF_FILES,
 AC_DEFUN(KDE_SET_PREFIX,
 [
   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
diff --git a/aclocal.m4 b/aclocal.m4
index 8116227..83359ac 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -389,13 +389,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)
@@ -536,11 +536,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
 [
 
         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
@@ -555,7 +555,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=""
@@ -1675,7 +1675,7 @@ fi
 if test -z "$1"; then
 
 kde_incdirs="/opt/trinity/include/kde /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"
@@ -1687,7 +1687,7 @@ So, check this please and use another prefix!])
 fi
 
 kde_libdirs="/opt/trinity/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"
@@ -3009,7 +3009,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
@@ -4593,8 +4593,8 @@ AC_DEFUN(KDE_CONF_FILES,
 AC_DEFUN(KDE_SET_PREFIX,
 [
   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
diff --git a/doc/help_en.docbook b/doc/help_en.docbook
index 7b899f8..42c2b30 100644
--- a/doc/help_en.docbook
+++ b/doc/help_en.docbook
@@ -610,10 +610,10 @@
 				Knights uses <application>autoconf</application> and <application>automake</application> to ensure that compiling is easy. If for some reason Knights won't compile for you, help is available at the Knights Project website located at <ulink url="http://knights.sourceforge.net/">http://knights.sourceforge.net</ulink>.
 			</para>
 			<para>
-				You must have the KDEDIR environment variable defined before you begin the installation. Without this, Knights will not be able to access it's resources! To add the KDEDIR environment variable, you need to edit your /etc/profile ( or ~/.bash_profile ) and add the line:
+				You must have the TDEDIR environment variable defined before you begin the installation. Without this, Knights will not be able to access it's resources! To add the TDEDIR environment variable, you need to edit your /etc/profile ( or ~/.bash_profile ) and add the line:
 			</para>
 			<para>
-				<userinput><command>export KDEDIR="/usr"</command></userinput>
+				<userinput><command>export TDEDIR="/usr"</command></userinput>
 			</para>
 			<para>
 				...where /usr is your KDE's base directory.
@@ -643,7 +643,7 @@
 <prompt>%</prompt> <userinput><command>knights</command> <option>-d <replaceable>path</replaceable></option></userinput>
 </screen>
 		<para>
-			The use of this command line option is depreciated. If Knights displays garbage rather than a chessboard, then you did not set the KDEDIR environment variable correctly before compiling Knights. Please see the Installation instructions for the proper compiling procedures.
+			The use of this command line option is depreciated. If Knights displays garbage rather than a chessboard, then you did not set the TDEDIR environment variable correctly before compiling Knights. Please see the Installation instructions for the proper compiling procedures.
 		</para>
 <screen width="40">
 <prompt>%</prompt> <userinput><command>knights</command> <option><replaceable>filename</replaceable></option></userinput>