1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
|
In the case of config files, we want a local sysadm dir added as well.
The priorities is as follows:
- peoples homedir (.kde4)
- for config files, /etc/kde4/
- what's defined in KDEDIRS
- the default install path.
With this patch, we can also install all config files into /usr/ as they just can get
overridden by adding new files to /etc/kde4 by the sysadm.
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1176,6 +1176,10 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
+ // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
+ if ( local && (!strcmp("config", type))) // local is used as a "homedir marker"
+ candidates.append(QLatin1String("/etc/kde4/"));
+ //
local = false;
}
else
|