[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 691233 by mlaurent:

change XDG_APPS_DIR -> XDG_APPS_INSTALL_DIR, XDG_DIRECTORY_DIR->XDG_DIRECTORY_INSTALL_DIR, DBUS_INTERFACES_DIR->DBUS_INTERFACES_INSTALL_ DIR, DBUS_SERVICES_DIR->DBUS_SERVICES_INSTALL_DIR to have same naming convention as discussed with Alex.


 M  +1 -1      cervisia/CMakeLists.txt  
 M  +1 -1      cervisia/cvsservice/CMakeLists.txt  
 M  +1 -1      kapptemplate/CMakeLists.txt  
 M  +1 -1      kate/data/CMakeLists.txt  
 M  +2 -2      kbabel/catalogmanager/CMakeLists.txt  
 M  +2 -2      kbabel/kbabel/CMakeLists.txt  
 M  +2 -2      kbabel/kbabeldict/CMakeLists.txt  
 M  +1 -1      kbugbuster/CMakeLists.txt  
 M  +1 -1      kcachegrind/kcachegrind/CMakeLists.txt  
 M  +1 -1      kioslave/svn/ksvnd/CMakeLists.txt  
 M  +1 -1      kompare/CMakeLists.txt  
 M  +1 -1      kuiviewer/CMakeLists.txt  
 M  +1 -1      umbrello/umbrello/CMakeLists.txt  


--- trunk/KDE/kdesdk/cervisia/CMakeLists.txt #691232:691233
@@ -107,7 +107,7 @@
 
 ########### install files ###############
 
-install( FILES cervisia.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES cervisia.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES cervisiapart.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 install( FILES cervisiaui.rc  DESTINATION  ${DATA_INSTALL_DIR}/cervisiapart )
 install( FILES cervisiashellui.rc cervisia.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/cervisia )
--- trunk/KDE/kdesdk/cervisia/cvsservice/CMakeLists.txt #691232:691233
@@ -52,4 +52,4 @@
 ########### install files ###############
 
 install( FILES  cvsservice.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES org.kde.cervisia.cvsjob.xml  org.kde.cervisia.cvsservice.xml  org.kde.cervisia.repository.xml org.kde.cervisia.cvsloginjob.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install( FILES org.kde.cervisia.cvsjob.xml  org.kde.cervisia.cvsservice.xml  org.kde.cervisia.repository.xml org.kde.cervisia.cvsloginjob.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kapptemplate/CMakeLists.txt #691232:691233
@@ -18,6 +18,6 @@
 
 install( FILES kapptemplate.common kapptemplate.module kapp4template.module kpartplugin.module kpartapp.module existing.module  DESTINATION  ${DATA_INSTALL_DIR}/kapptemplate/include )
 
-install( FILES kapptemplate.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kapptemplate.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 
 
--- trunk/KDE/kdesdk/kate/data/CMakeLists.txt #691232:691233
@@ -1,4 +1,4 @@
-install( FILES kate.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kate.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES katerc  DESTINATION  ${CONFIG_INSTALL_DIR} )
 install( FILES default.katesession tips kateui.rc externaltools DESTINATION  ${DATA_INSTALL_DIR}/kate )
 install( FILES kateplugin.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kbabel/catalogmanager/CMakeLists.txt #691232:691233
@@ -61,9 +61,9 @@
 
 ########### install files ###############
 
-install( FILES catalogmanager.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES catalogmanager.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES catalogmanagerui.rc  DESTINATION  ${DATA_INSTALL_DIR}/catalogmanager )
-install( FILES org.kde.kbabel.catalogmanager.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install( FILES org.kde.kbabel.catalogmanager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/KDE/kdesdk/kbabel/kbabel/CMakeLists.txt #691232:691233
@@ -75,11 +75,11 @@
 target_link_libraries(kbabel  ${KDE4_KDE3SUPPORT_LIBS} kbabelcommon ${KDE4_KTEXTEDITOR_LIBS} kbabeldictplugin kbabelcommonui)
 
 install(TARGETS kbabel  DESTINATION ${BIN_INSTALL_DIR} )
-install(FILES org.kde.kbabel.kbabel.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install(FILES org.kde.kbabel.kbabel.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
 ########### install files ###############
 
-install( FILES kbabel.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kbabel.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES kbabel.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 install( FILES kbabelui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kbabel )
 install( FILES kbabel-project.upd kbabel-difftoproject.upd  DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kbabel/kbabeldict/CMakeLists.txt #691232:691233
@@ -39,11 +39,11 @@
 
 ########### install files ###############
 
-install( FILES kbabeldict.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kbabeldict.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES kbabeldict_module.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 install( FILES searchengine.h kbabeldictbox.h 
     dictionarymenu.h dictchooser.h DESTINATION ${INCLUDE_INSTALL_DIR} )
-install( FILES org.kde.kbabel.kbabeldict.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install( FILES org.kde.kbabel.kbabeldict.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/KDE/kdesdk/kbugbuster/CMakeLists.txt #691232:691233
@@ -77,7 +77,7 @@
 
 ########### install files ###############
 
-install( FILES kbugbuster.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kbugbuster.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/CMakeLists.txt #691232:691233
@@ -64,7 +64,7 @@
 
 ########### install files ###############
 
-install( FILES kcachegrind.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kcachegrind.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES tips  DESTINATION  ${DATA_INSTALL_DIR}/kcachegrind )
 install( FILES kcachegrindui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kcachegrind )
 
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/CMakeLists.txt #691232:691233
@@ -19,5 +19,5 @@
 ########### install files ###############
 
 install( FILES ksvnd.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kded )
-install( FILES org.kde.ksvnd.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install( FILES org.kde.ksvnd.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kompare/CMakeLists.txt #691232:691233
@@ -50,7 +50,7 @@
 
 ########### install files ###############
 
-install( FILES kompare.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kompare.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES kompareui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kompare )
 install( FILES komparenavigationpart.desktop kompareviewpart.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kuiviewer/CMakeLists.txt #691232:691233
@@ -44,7 +44,7 @@
 
 ########### install files ###############
 
-install( FILES kuiviewer.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES kuiviewer.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES designerthumbnail.desktop kuiviewer_part.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install( FILES kuiviewer_part.rc  DESTINATION  ${DATA_INSTALL_DIR}/kuiviewerpart )
 install( FILES kuiviewerui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kuiviewer )
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #691232:691233
@@ -406,7 +406,7 @@
 
 ########### install files ###############
 
-install( FILES umbrello.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES umbrello.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES
   umbrelloui.rc
   docgenerators/xmi2docbook.xsl