KDE/kdelibs

[David Faure]

SVN commit 648276 by dfaure:

Changed the services and servicetypes directories to "kde4/services" and "kde4/servicetypes"
so that we never try to use a kde3 KPart into a kde4 application, and vice versa,
and to avoid conflicts when installing both into the same prefix.

This solution also leaves room for prepending a kde4/ in front of other resources if needed...
maybe most of them, apart from those that affect $KDEHOME too (like config and data...)

CCMAIL: kde-core-devel at kde.org


 M  +9 -2      cmake/modules/FindKDE4Internal.cmake  
 M  +2 -2      kdecore/kernel/kstandarddirs.cpp  


--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #648275:648276
@@ -271,8 +271,15 @@
 _set_fancy(KCFG_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/config.kcfg"  "The install dir for kconfig files")
 _set_fancy(LOCALE_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/locale"       "The install dir for translations")
 _set_fancy(MIME_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/mimelnk"      "The install dir for the mimetype desktop files")
-_set_fancy(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/services"     "The install dir for service (desktop, protocol, ...) files")
-_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes" "The install dir for servicestypes desktop files")
+
+# To help with the migration issue, this uses set instead of _set_fancy, temporarily.
+# (Otherwise all modules would keep installing into the old dirs)
+# This can be reverted starting from May 2007
+set(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/kde4/services")
+set(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes")
+#_set_fancy(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/kde4/services"     "The install dir for service (desktop, protocol, ...) files")
+#_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes" "The install dir for servicestypes desktop files")
+
 _set_fancy(SOUND_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/sounds"       "The install dir for sound files")
 _set_fancy(TEMPLATES_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/templates"    "The install dir for templates (Create new file...)")
 _set_fancy(WALLPAPER_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/wallpapers"   "The install dir for wallpapers")
--- trunk/KDE/kdelibs/kdecore/kernel/kstandarddirs.cpp #648275:648276
@@ -1229,9 +1229,9 @@
     if (!strcmp(type, "locale"))
         return "share/locale/";
     if (!strcmp(type, "services"))
-        return "share/services/";
+        return "share/kde4/services/";
     if (!strcmp(type, "servicetypes"))
-        return "share/servicetypes/";
+        return "share/kde4/servicetypes/";
     if (!strcmp(type, "mime"))
         return "share/mimelnk/";
     if (!strcmp(type, "cgi"))