summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/tdesvn-build24
-rw-r--r--scripts/tdesvn-buildrc-sample2
-rw-r--r--scripts/tdesvn-buildrc.xml2
3 files changed, 14 insertions, 14 deletions
diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build
index 99911ece..73951a0f 100755
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@@ -118,7 +118,7 @@ Allow you to run the script with a lower priority. The default value is
=item B<--prefix=/kde/path>
-This option is a shortcut to change the setting for kdedir from the
+This option is a shortcut to change the setting for tdedir from the
command line. It implies B<--reconfigure>.
=item B<--color>
@@ -300,7 +300,7 @@ my %package_opts = (
"email-on-compile-error" => "",
"install-after-build" => "1", # Default to true
"inst-apps" => "",
- "kdedir" => "$ENV{HOME}/kde",
+ "tdedir" => "$ENV{HOME}/kde",
"libpath" => "",
"log-dir" => "log",
"make-install-prefix" => "", # Some people need sudo
@@ -786,7 +786,7 @@ sub get_option
my $option = shift;
my $global_opts = $package_opts{'global'};
my $defaultQtCopyArgs = '-qt-gif -plugin-imgfmt-mng -thread -no-exceptions -debug -dlopen-opengl -plugin-sql-sqlite';
- my @lockedOpts = qw(source-dir svn-server qtdir libpath binpath kdedir
+ my @lockedOpts = qw(source-dir svn-server qtdir libpath binpath tdedir
pretend disable-agent-check);
# These options can't override globals
@@ -1677,7 +1677,7 @@ sub initialize_environment
my $svnserver = get_option ('global', 'svn-server');
- my $pc_path = get_option('global', 'kdedir') . "/lib/pkgconfig";
+ my $pc_path = get_option('global', 'tdedir') . "/lib/pkgconfig";
$pc_path .= ":" . $ENV{'PKG_CONFIG_PATH'} if ( exists $ENV{'PKG_CONFIG_PATH'} );
$ENV{'PKG_CONFIG_PATH'} = $pc_path;
@@ -1932,7 +1932,7 @@ Options:
--nice=<value> Allows you to run the script with a lower priority
The default value is 10 (lower priority by 10 steps).
--prefix=/kde/path This option is a shortcut to change the setting for
- kdedir from the command line. It implies
+ tdedir from the command line. It implies
--reconfigure.
--resume Tries to resume the make process from the last time
@@ -2075,7 +2075,7 @@ DONE
exit 8;
}
- set_option('global', '#kdedir', $prefix);
+ set_option('global', '#tdedir', $prefix);
set_option('global', '#reconfigure', 1);
last SWITCH;
@@ -2798,10 +2798,10 @@ sub safe_configure
if ($module ne 'qt-copy')
{
- my $kdedir = get_option ('global', 'kdedir');
+ my $tdedir = get_option ('global', 'tdedir');
my $prefix = get_option ($module, 'prefix');
- $prefix = $kdedir unless $prefix;
+ $prefix = $tdedir unless $prefix;
push @commands, "CXXFLAGS=$cxxflags" if $cxxflags;
push @commands, "--prefix=$prefix";
@@ -3427,10 +3427,10 @@ sub setup_build_system
sub update_module_environment
{
my $module = shift;
- my $kdedir = get_option ($module, 'kdedir');
+ my $tdedir = get_option ($module, 'tdedir');
my $qtdir = get_option ($module, 'qtdir');
- my $path = join(':', "$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath'));
- my $libdir = join(':', "$qtdir/lib", "$kdedir/lib", get_option ($module, 'libpath'));
+ my $path = join(':', "$qtdir/bin", "$tdedir/bin", get_option ($module, 'binpath'));
+ my $libdir = join(':', "$qtdir/lib", "$tdedir/lib", get_option ($module, 'libpath'));
# Set up the tqchildren's environment. We use setenv since it
# won't set an environment variable to nothing. (e.g, setting
@@ -3461,7 +3461,7 @@ sub update_module_environment
setenv ('LD_LIBRARY_PATH', $libdir);
setenv ('PATH', $path);
- setenv ('TDEDIR', $kdedir);
+ setenv ('TDEDIR', $tdedir);
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 f39ae662..c54bb18f 100644
--- a/scripts/tdesvn-buildrc-sample
+++ b/scripts/tdesvn-buildrc-sample
@@ -65,7 +65,7 @@ global
# permissions. If you'd like, you can install and use the sudo program to
# install KDE anywhere on your system, in conjunction with the
# make-install-prefix option.
-# kdedir ~/kde
+# tdedir ~/kde
#
# You can overwrite the installation directory for a given module using
# the per-module "prefix" option. Note that when doing this you need to
diff --git a/scripts/tdesvn-buildrc.xml b/scripts/tdesvn-buildrc.xml
index 547950d3..887e87f6 100644
--- a/scripts/tdesvn-buildrc.xml
+++ b/scripts/tdesvn-buildrc.xml
@@ -55,7 +55,7 @@
<item>email-on-compile-error</item>
<item>install-after-build</item>
<item>inst-apps</item>
- <item>kdedir</item>
+ <item>tdedir</item>
<item>libpath</item>
<item>log-dir</item>
<item>make-install-prefix</item>