Commit 48b118b2 authored by Michael Pyne's avatar Michael Pyne
Browse files

Backport bugfix for incorrect /admin symlinking to KDE 3.5.

svn path=/branches/KDE/3.5/kdesdk/scripts/kdesvn-build; revision=453034
parent 9650084d
......@@ -2908,6 +2908,9 @@ sub create_admin_dir
}
chdir ($fullpath);
whisper "\tCreating symbolic link to g[/admin directory].";
return symlink $admindir, "$fullpath/admin";
}
......@@ -3075,15 +3078,6 @@ sub safe_create_build_system
chdir ($builddir);
}
# Check for admin dir, if it doesn't exist, create a softlink
if (not create_admin_dir($module))
{
warning "Unable to find /admin directory for y[$module], it probably";
warning "won't build.";
# But continue anyways, because in this case I'm just not sure that it
# won't work in the future. ;)
}
if ($instapps)
{
open (INSTAPPS, ">inst-apps") or do {
......@@ -3356,6 +3350,15 @@ sub setup_build_system
}
}
# Check for admin dir, if it doesn't exist, create a softlink
if (not create_admin_dir($module))
{
warning "Unable to find /admin directory for y[$module], it probably";
warning "won't build.";
# But continue anyways, because in this case I'm just not sure that it
# won't work in the future. ;)
}
my $confpath = module_needs_builddir_help($module) ? $builddir : $fullpath;
if ($do_makeconf or not -e "$confpath/configure")
......
Markdown is supported
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