Rename KDEHOME and KDEDIR

pull/1/head
Timothy Pearson 13 years ago
parent 91fc0fb099
commit 11de8ef0ca

@ -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 The programs kde-config, qmake, uic and moc must be accesssible
through your PATH. 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 So until kde-config is able to give that information, you may
have to give those paths. have to give those paths.

@ -51,7 +51,7 @@ def detect_kde(env):
print "Make sure kde is installed properly" print "Make sure kde is installed properly"
print "(missing package tdebase-devel?)" print "(missing package tdebase-devel?)"
env.Exit(1) 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 : ", print "Checking for kde version : ",
kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1] 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_UIC', 'moc directory'),
( 'QT_MOC', 'moc executable command'), ( 'QT_MOC', 'moc executable command'),
( 'QTPLUGINS', 'uic executable command'), ( 'QTPLUGINS', 'uic executable command'),
( 'KDEDIR', 'root of kde directory' ), ( 'TDEDIR', 'root of kde directory' ),
( 'KDELIBPATH', 'path to the kde libs' ), ( 'KDELIBPATH', 'path to the kde libs' ),
( 'KDEINCLUDEPATH', 'path to the kde includes' ), ( '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) opts.Update(env)
# reconfigure when things are missing # 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) detect_kde(env)
# finally save the configuration # finally save the configuration

@ -52,7 +52,7 @@ def detect_kde(env):
print "Make sure kde is installed properly" print "Make sure kde is installed properly"
print "(missing package tdebase-devel?)" print "(missing package tdebase-devel?)"
env.Exit(1) 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 : ", print "Checking for kde version : ",
kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1] 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_UIC', 'moc directory'),
('QT_MOC', 'moc executable command'), ('QT_MOC', 'moc executable command'),
('QTPLUGINS', 'uic executable command'), ('QTPLUGINS', 'uic executable command'),
('KDEDIR', 'root of kde directory'), ('TDEDIR', 'root of kde directory'),
('KDELIBPATH', 'path to the kde libs'), ('KDELIBPATH', 'path to the kde libs'),
('KDEINCLUDEPATH', 'path to the kde includes'), ('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) opts.Update(env)
# reconfigure when things are missing # 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) detect_kde(env)
# finally save the configuration to the cache file # finally save the configuration to the cache file

@ -17,7 +17,7 @@
SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
KDEDIR=`kde-config --prefix` TDEDIR=`kde-config --prefix`
EXTRACTRC=extractrc EXTRACTRC=extractrc
KDEPOT=`kde-config --prefix`/include/kde.pot KDEPOT=`kde-config --prefix`/include/kde.pot
XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT " XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "

Loading…
Cancel
Save