diff options
Diffstat (limited to 'scripts/kde-build')
| -rwxr-xr-x | scripts/kde-build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/kde-build b/scripts/kde-build index de6f6c3b..666e763e 100755 --- a/scripts/kde-build +++ b/scripts/kde-build @@ -51,7 +51,7 @@ err_install_fail="5" # err_inv_kdesrcdir="6" -# The $QTDIR variable wasn't set, points to a non-existant directory or +# The $TQTDIR variable wasn't set, points to a non-existant directory or # doesn't contain a bin/, lib/, or include/ subdirectory. # err_inv_qtdir="7" @@ -370,7 +370,7 @@ if [ "$dousage" -eq 1 ]; then fi # Expand ~ -QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"` +TQTDIR=`echo "$TQTDIR" | sed -e "s,^\~/,$HOME/,"` KDESRCDIR=`echo "$KDESRCDIR" | sed -e "s,^\~/,$HOME/,"` KDEBUILDDIR=`echo "$KDEBUILDDIR" |sed -e "s,^\~/,$HOME/,"` TDEDIRS=`echo "$TDEDIRS" |sed -e "s,^\~/,$HOME/,"` @@ -378,9 +378,9 @@ KDELOGDIR=`echo "$KDELOGDIR" |sed -e "s,^\~/,$HOME/,"` # Make sure some paths are according to the rc file. Note that there are AFAIK # UNIX flavors which don't support LD_LIBRARY_PATH -PATH=$QTDIR/bin:$TDEDIRS/bin:$PATH -MANPATH=$QTDIR/doc/man:$MANPATH -LD_LIBRARY_PATH=$TDEDIRS/lib:$QTDIR/lib:$LD_LIBRARY_PATH +PATH=$TQTDIR/bin:$TDEDIRS/bin:$PATH +MANPATH=$TQTDIR/doc/man:$MANPATH +LD_LIBRARY_PATH=$TDEDIRS/lib:$TQTDIR/lib:$LD_LIBRARY_PATH if [ -n "$USE_UNSERMAKE" ]; then if [ -n "$MAKE" ]; then @@ -445,7 +445,7 @@ fi if [ ! -d "$KDESRCDIR" ]; then echo "ERROR: Invalid source directory specified!"; exit $err_inv_kdesrcdir fi -if [ ! -d "$QTDIR" -o ! -d "$QTDIR/lib" -o ! -d "$QTDIR/bin" -o ! -d "$QTDIR/include" ]; then +if [ ! -d "$TQTDIR" -o ! -d "$TQTDIR/lib" -o ! -d "$TQTDIR/bin" -o ! -d "$TQTDIR/include" ]; then echo "ERROR: Invalid Qt directory specified!"; exit $err_inv_qtdir fi @@ -678,9 +678,9 @@ for module in $modules; do echo -n " Configuring..." set_title "Configuring module $module..." if [ -n "$KDEBUILDDIR" ]; then - cmd_configure="$KDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR" + cmd_configure="$KDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$TQTDIR" else - cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR" + cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$TQTDIR" fi if echo $CONFIGUREFLAGS | grep -v -- "--prefix=" 2>/dev/null >/dev/null; then cmd_configure="$cmd_configure --prefix=$TDEDIRS" |