Rename KDEHOME and KDEDIR

admin/kde.py

@@ -94,8 +94,8 @@ def detect_kde(env):
 		print "Make sure kde is installed properly"
 		print "(missing package tdebase-devel?)"
 		env.Exit(1)
-	if kdedir: env['KDEDIR']=kdedir
+	if kdedir: env['TDEDIR']=kdedir
-	else: env['KDEDIR'] = os.popen(kde_config+' -prefix').read().strip()
+	else: 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]
@@ -305,7 +305,7 @@ def generate(env):
 		('QT_MOC', 'moc command'),
 		('QTPLUGINS', 'uic executable command'),
 
-		('KDEDIR', ''),
+		('TDEDIR', ''),
 		('KDELIBPATH', 'path to the installed kde libs'),
 		('KDEINCLUDEPATH', 'path to the installed kde includes'),
 
@@ -332,7 +332,7 @@ def generate(env):
 		return instdir
 
 	# reconfigure when things are missing
-	if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('QTDIR') or not env.has_key('KDEDIR')):
+	if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR')):
 		detect_kde(env)
 		opts.Save(cachefile, env)
 

po/messages.sh

@@ -20,7 +20,7 @@
 SRCDIR=../src
 TIPSDIR=$SRCDIR/appdata
 
-KDEDIR=`kde-config --prefix`
+TDEDIR=`kde-config --prefix`
 EXTRACTRC=extractrc
 KDEPOT=`kde-config --prefix`/include/kde/kde.pot
 XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "