diff options
Diffstat (limited to 'scripts/kde-build')
| -rwxr-xr-x | scripts/kde-build | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/kde-build b/scripts/kde-build index 55cae0e5..de6f6c3b 100755 --- a/scripts/kde-build +++ b/scripts/kde-build @@ -43,7 +43,7 @@ err_configure_fail="3" err_compile_fail="4" # The installation of a module failed - this mostly happens if there's not -# enough free disk space on the partition which $KDEDIRS is mounted to. +# enough free disk space on the partition which $TDEDIRS is mounted to. # err_install_fail="5" @@ -255,7 +255,7 @@ install_module() { [ -n "$cmd_compress" ] && eval "$cmd_compress $logfile" fi echo "$str_okay" - echo "Module $module successfully installed in $KDEDIRS!" + echo "Module $module successfully installed in $TDEDIRS!" move_logfile "finished" else echo "$str_error" @@ -373,14 +373,14 @@ fi QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"` KDESRCDIR=`echo "$KDESRCDIR" | sed -e "s,^\~/,$HOME/,"` KDEBUILDDIR=`echo "$KDEBUILDDIR" |sed -e "s,^\~/,$HOME/,"` -KDEDIRS=`echo "$KDEDIRS" |sed -e "s,^\~/,$HOME/,"` +TDEDIRS=`echo "$TDEDIRS" |sed -e "s,^\~/,$HOME/,"` 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:$KDEDIRS/bin:$PATH +PATH=$QTDIR/bin:$TDEDIRS/bin:$PATH MANPATH=$QTDIR/doc/man:$MANPATH -LD_LIBRARY_PATH=$KDEDIRS/lib:$QTDIR/lib:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=$TDEDIRS/lib:$QTDIR/lib:$LD_LIBRARY_PATH if [ -n "$USE_UNSERMAKE" ]; then if [ -n "$MAKE" ]; then @@ -471,14 +471,14 @@ fi # Clean the installation directory if selected. # if test "$INSTALLFROMSCRATCH" = yes && test -z "$specifiedModules" ; then - mkdir -p $KDEDIRS 2> /dev/null - if [ ! -w $KDEDIRS ]; then + mkdir -p $TDEDIRS 2> /dev/null + if [ ! -w $TDEDIRS ]; then echo "Enter the root password to clean the installation directory." - echo "WARNING: All files and directories in $KDEDIRS will be deleted!" + echo "WARNING: All files and directories in $TDEDIRS will be deleted!" echo -n "Please enter root " - eval "$cmd_sudo rm -rf $KDEDIRS/*" + eval "$cmd_sudo rm -rf $TDEDIRS/*" else - rm -rf $KDEDIRS/* + rm -rf $TDEDIRS/* fi fi @@ -683,7 +683,7 @@ for module in $modules; do cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR" fi if echo $CONFIGUREFLAGS | grep -v -- "--prefix=" 2>/dev/null >/dev/null; then - cmd_configure="$cmd_configure --prefix=$KDEDIRS" + cmd_configure="$cmd_configure --prefix=$TDEDIRS" fi [ "$NICECOMPILE" = yes ] && cmd_configure="nice $cmd_configure" configure_skipped=0 @@ -802,7 +802,7 @@ for module in $modules; do [ $critical -eq 0 ] && cmd_make_install="$cmd_make_install -k" [ "$NICECOMPILE" = yes ] && cmd_make_install="nice $cmd_make_install" cmd_make_install="$cmd_make_install install" - if [ ! -w $KDEDIRS ]; then + if [ ! -w $TDEDIRS ]; then eval "$cmd_sudo \"$cmd_make_install\"" else install_module |