From 11de8ef0ca957c791ddf99cbe5ddb781f500a79a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 7 Dec 2011 18:52:06 -0600
Subject: [PATCH] Rename KDEHOME and KDEDIR

---
 INSTALL        | 2 +-
 admin/kde.py   | 6 +++---
 kde.py         | 6 +++---
 po/messages.sh | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index a9876f5..4f763d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,7 +51,7 @@ The installation scripts are relying on the kde-config program.
 The programs kde-config, qmake, uic and moc must be accesssible
 through your PATH.
 
-Qt and kde may not be installed as expected (in QTDIR and KDEDIR)
+Qt and kde may not be installed as expected (in QTDIR and TDEDIR)
 So until kde-config is able to give that information, you may
 have to give those paths.
 
diff --git a/admin/kde.py b/admin/kde.py
index a563ce9..736cdf8 100644
--- a/admin/kde.py
+++ b/admin/kde.py
@@ -51,7 +51,7 @@ def detect_kde(env):
 		print "Make sure kde is installed properly"
 		print "(missing package tdebase-devel?)"
 		env.Exit(1)
-	env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()
+	env['TDEDIR'] = os.popen('kde-config -prefix').read().strip()
 
 	print "Checking for kde version          : ",
 	kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1]
@@ -274,7 +274,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		( 'QT_UIC', 'moc directory'),
 		( 'QT_MOC', 'moc executable command'),
 		( 'QTPLUGINS', 'uic executable command'),
-		( 'KDEDIR', 'root of kde directory' ),
+		( 'TDEDIR', 'root of kde directory' ),
 		( 'KDELIBPATH', 'path to the kde libs' ),
 		( 'KDEINCLUDEPATH', 'path to the kde includes' ),
 
@@ -296,7 +296,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	opts.Update(env)
 
 	# reconfigure when things are missing
-	if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('KDEDIR'):
+	if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR'):
 		detect_kde(env)
 
 	# finally save the configuration
diff --git a/kde.py b/kde.py
index 2eb2e3d..83c660a 100644
--- a/kde.py
+++ b/kde.py
@@ -52,7 +52,7 @@ def detect_kde(env):
 		print "Make sure kde is installed properly"
 		print "(missing package tdebase-devel?)"
 		env.Exit(1)
-	env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()
+	env['TDEDIR'] = os.popen('kde-config -prefix').read().strip()
 
 	print "Checking for kde version          : ",
 	kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1]
@@ -388,7 +388,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		('QT_UIC', 'moc directory'),
 		('QT_MOC', 'moc executable command'),
 		('QTPLUGINS', 'uic executable command'),
-		('KDEDIR', 'root of kde directory'),
+		('TDEDIR', 'root of kde directory'),
 		('KDELIBPATH', 'path to the kde libs'),
 		('KDEINCLUDEPATH', 'path to the kde includes'),
 
@@ -412,7 +412,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	opts.Update(env)
 
 	# reconfigure when things are missing
-	if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('KDEDIR'):
+	if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR'):
 		detect_kde(env)
 
 	# finally save the configuration to the cache file
diff --git a/po/messages.sh b/po/messages.sh
index a36f5c9..2fd4f0b 100755
--- a/po/messages.sh
+++ b/po/messages.sh
@@ -17,7 +17,7 @@
 SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
 TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
 
-KDEDIR=`kde-config --prefix`
+TDEDIR=`kde-config --prefix`
 EXTRACTRC=extractrc
 KDEPOT=`kde-config --prefix`/include/kde.pot
 XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "