diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kde-build | 24 | ||||
| -rw-r--r-- | scripts/kde-buildrc | 2 | ||||
| -rw-r--r-- | scripts/kde-devel-vim.vim | 12 | ||||
| -rwxr-xr-x | scripts/kdedoc | 2 | ||||
| -rwxr-xr-x | scripts/tdesvn-build | 2 | ||||
| -rw-r--r-- | scripts/tdesvn-buildrc-sample | 4 | ||||
| -rw-r--r-- | scripts/tdesvn-buildrc.xml | 4 |
7 files changed, 25 insertions, 25 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 diff --git a/scripts/kde-buildrc b/scripts/kde-buildrc index c6f13d44..24553e01 100644 --- a/scripts/kde-buildrc +++ b/scripts/kde-buildrc @@ -14,7 +14,7 @@ KDEBUILDDIR="" # Where shall I put the binaries? # -KDEDIRS="/opt/kde" +TDEDIRS="/opt/kde" # Where is your Qt 3.3.x? # diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 563ee41c..7b8961fe 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -16,13 +16,13 @@ set path=.,/usr/include,/usr/local/include, if $QTDIR != '' let &path = &path . $QTDIR . '/include/,' endif -if $KDEDIR != '' - let &path = &path . $KDEDIR . '/include/,' - let &path = &path . $KDEDIR . '/include/arts/,' +if $TDEDIR != '' + let &path = &path . $TDEDIR . '/include/,' + let &path = &path . $TDEDIR . '/include/arts/,' endif -if $KDEDIRS != '' - let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include,', 'g' ) - let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include/arts,', 'g' ) +if $TDEDIRS != '' + let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include,', 'g' ) + let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include/arts,', 'g' ) endif set path+=, diff --git a/scripts/kdedoc b/scripts/kdedoc index 0a8191d2..f61a8452 100755 --- a/scripts/kdedoc +++ b/scripts/kdedoc @@ -6,7 +6,7 @@ # You can edit this line to set the directory holding your KDE docs, or you # can use the environment variable KDEDOCS to avoid future conflicts with this # file if the default changes. -KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/tdelibs-apidocs"} +KDEDOCS=${KDEDOCS:-"$TDEDIR/share/doc/HTML/en/tdelibs-apidocs"} if [ $# = 1 ]; then if [ -e "$KDEDOCS/doxygen.css" ]; then diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index fb81ac67..99911ece 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -3461,7 +3461,7 @@ sub update_module_environment setenv ('LD_LIBRARY_PATH', $libdir); setenv ('PATH', $path); - setenv ('KDEDIR', $kdedir); + setenv ('TDEDIR', $kdedir); setenv ('QTDIR', $qtdir); # Qt has several defines of its own. Special case qt-copy for this diff --git a/scripts/tdesvn-buildrc-sample b/scripts/tdesvn-buildrc-sample index 2d8b9bac..f39ae662 100644 --- a/scripts/tdesvn-buildrc-sample +++ b/scripts/tdesvn-buildrc-sample @@ -69,8 +69,8 @@ global # # You can overwrite the installation directory for a given module using # the per-module "prefix" option. Note that when doing this you need to -# set KDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories, -# and that you should use separate test users or KDEHOME values to separate +# set TDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories, +# and that you should use separate test users or TDEHOME values to separate # the ksycoca databases. Only set prefix if you know what you're doing. # If you would like install KDE to the system (DO NOT INSTALL *over* a prior diff --git a/scripts/tdesvn-buildrc.xml b/scripts/tdesvn-buildrc.xml index d6b915b1..547950d3 100644 --- a/scripts/tdesvn-buildrc.xml +++ b/scripts/tdesvn-buildrc.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> -<!-- This goes into $KDEDIR/share/apps/katepart/syntax, or - it can go to $KDEHOME/share/apps/katepart/syntax +<!-- This goes into $TDEDIR/share/apps/katepart/syntax, or + it can go to $TDEHOME/share/apps/katepart/syntax --> <language name="tdesvn-buildrc" version="0.2" kateversion="2.4" section="Configuration" extensions=".tdesvn-buildrc;tdesvn-buildrc" author="Michael Pyne <michael.pyne@kdemail.net>" license="LGPL"> |