$NetBSD: patch-an,v 1.3 2004/02/04 13:58:39 markd Exp $

--- kdecore/kstandarddirs.cpp.orig	2004-01-26 06:24:42.000000000 +1300
+++ kdecore/kstandarddirs.cpp
@@ -847,33 +847,33 @@ static int tokenize( QStringList& tokens
 
 QString KStandardDirs::kde_default(const char *type) {
     if (!strcmp(type, "data"))
-	return "share/apps/";
+	return "share/kde/apps/";
     if (!strcmp(type, "html"))
-	return "share/doc/HTML/";
+	return "share/doc/kde/HTML/";
     if (!strcmp(type, "icon"))
-	return "share/icons/";
+	return "share/kde/icons/";
     if (!strcmp(type, "config"))
-	return "share/config/";
+	return "share/kde/config/";
     if (!strcmp(type, "pixmap"))
-	return "share/pixmaps/";
+	return "share/kde/pixmaps/";
     if (!strcmp(type, "apps"))
-	return "share/applnk/";
+	return "share/kde/applnk/";
     if (!strcmp(type, "sound"))
-	return "share/sounds/";
+	return "share/kde/sounds/";
     if (!strcmp(type, "locale"))
-	return "share/locale/";
+	return "share/kde/locale/";
     if (!strcmp(type, "services"))
-	return "share/services/";
+	return "share/kde/services/";
     if (!strcmp(type, "servicetypes"))
-	return "share/servicetypes/";
+	return "share/kde/servicetypes/";
     if (!strcmp(type, "mime"))
-	return "share/mimelnk/";
+	return "share/kde/mimelnk/";
     if (!strcmp(type, "cgi"))
-	return "cgi-bin/";
+	return "kde-cgi-bin/";
     if (!strcmp(type, "wallpaper"))
-	return "share/wallpapers/";
+	return "share/kde/wallpapers/";
     if (!strcmp(type, "templates"))
-	return "share/templates/";
+	return "share/kde/templates/";
     if (!strcmp(type, "exe"))
 	return "bin/";
     if (!strcmp(type, "lib"))
@@ -889,7 +889,7 @@ QString KStandardDirs::kde_default(const
     if (!strcmp(type, "xdgconf-menu"))
         return "menus/";
     if (!strcmp(type, "kcfg"))
-	return "share/config.kcfg";
+	return "share/kde/config.kcfg";
     qFatal("unknown resource type %s", type);
     return QString::null;
 }
@@ -1129,6 +1129,7 @@ void KStandardDirs::addKDEDefaults()
         }
 
         xdgdirList.append("/usr/local/share/");
+        xdgdirList.append(KDEDIR "/share/");
         xdgdirList.append("/usr/share/");
     }