Commit 71cf5e8e authored by Michael Pyne's avatar Michael Pyne
Browse files

Adapt recent per-module-prefix addition to kdesvn-build coding style.

Most notably, the "if defined" test is almost never used that way an empty
string will be treated as false as well (which allows me to have a default
value for every option kdesvn-build knows about).

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=435022
parent 529a97f9
......@@ -284,6 +284,7 @@ my %package_opts = (
"no-svn" => "",
"no-rebuild-on-fail" => "",
"override-url" => "",
"prefix" => "", # Override installation prefix.
"pretend" => "",
"qtdir" => "$ENV{HOME}/kdesvn/build/qt-copy",
"reconfigure" => "",
......@@ -2563,10 +2564,12 @@ sub safe_configure
if ($module ne 'qt-copy')
{
push @commands, "CXXFLAGS=$cxxflags" if $cxxflags;
my $kdedir = get_option ('global', 'kdedir');
my $prefix = get_option ($module, 'prefix');
$prefix = $kdedir unless defined($prefix);
$prefix = $kdedir unless $prefix;
push @commands, "CXXFLAGS=$cxxflags" if $cxxflags;
push @commands, "--prefix=$prefix";
# We're special casing these modules because we're using the lndir
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment