diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | kde.py | 16 |
2 files changed, 9 insertions, 9 deletions
@@ -51,7 +51,7 @@ The installation scripts are relying on the tde-config program. The programs tde-config, qmake, uic and moc must be accesssible through your PATH. -Qt and tde may not be installed as expected (in QTDIR and TDEDIR) +Qt and tde may not be installed as expected (in TQTDIR and TDEDIR) So until tde-config is able to give that information, you may have to give those paths. @@ -86,7 +86,7 @@ def detect_kde(env): ## Detect the qt library print "Checking for the qt library : ", - qtdir = os.getenv("QTDIR") + qtdir = os.getenv("TQTDIR") if qtdir: print GREEN+"qt is in "+qtdir+NORMAL else: @@ -102,9 +102,9 @@ def detect_kde(env): print YELLOW+"qt was found as "+m.group(1)+NORMAL else: print RED+"qt was not found"+NORMAL - print RED+"Please set QTDIR first (/usr/lib/qt3?)"+NORMAL + print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL env.Exit(1) - env['QTDIR'] = qtdir.strip() + env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic-tqt and moc print "Checking for uic-tqt : ", @@ -120,7 +120,7 @@ def detect_kde(env): if len(uic): print YELLOW+"uic-tqt was found as "+uic+NORMAL else: - print RED+"uic-tqt was not found - set QTDIR put it in your PATH ?"+NORMAL + print RED+"uic-tqt was not found - set TQTDIR put it in your PATH ?"+NORMAL env.Exit(1) env['QT_UIC'] = uic @@ -139,7 +139,7 @@ def detect_kde(env): moc = "/usr/share/qt3/bin/tqmoc" print YELLOW + "moc was found as " + moc + NORMAL else: - print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL + print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL env.Exit(1) env['QT_MOC'] = moc @@ -418,7 +418,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.AddOptions( ('PREFIX', 'root of the program installation'), - ('QTDIR', 'root of qt directory'), + ('TQTDIR', 'root of qt directory'), ('TQTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), ('TQTINCLUDEPATH', 'path to the tqt includes'), @@ -449,7 +449,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('TDEDIR'): + if 'configure' in env['TARGS'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR'): detect_kde(env) # finally save the configuration to the cache file @@ -465,7 +465,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_DEBUG'] = 0 env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' - env['QT_LIBS'] = 'tqt' + env['TQT_LIBS'] = 'tqt' env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' |