mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
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.
svn path=/trunk/KDE/kdebase/apps/; revision=691218
This commit is contained in:
parent
bc237ff04e
commit
50cc53b211
13 changed files with 13 additions and 13 deletions
|
@ -123,7 +123,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
|
|||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
install( FILES dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
|
||||
install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ target_link_libraries(kappfinder_install ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIB
|
|||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kappfinder.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kappfinder.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -16,5 +16,5 @@ install(TARGETS kdepasswd DESTINATION ${BIN_INSTALL_DIR})
|
|||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -19,4 +19,4 @@ kde4_add_executable(kdialog ${kdialog_SRCS})
|
|||
target_link_libraries(kdialog ${KDE4_KFILE_LIBS} )
|
||||
|
||||
install(TARGETS kdialog DESTINATION ${BIN_INSTALL_DIR})
|
||||
install(FILES org.kde.kdialog.ProgressDialog.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install(FILES org.kde.kdialog.ProgressDialog.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
|
|
@ -32,7 +32,7 @@ install(TARGETS kfind DESTINATION ${BIN_INSTALL_DIR})
|
|||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kfind.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kfind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
install( FILES findpart.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||
install( FILES kfindpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ endif(UNIX)
|
|||
|
||||
########### install files ###############
|
||||
install( FILES konqfilemgr.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
install( FILES kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
install( FILES konqueror.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
||||
install(FILES profile_webbrowsing.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME webbrowsing)
|
||||
|
|
|
@ -22,5 +22,5 @@ install(TARGETS kded_konqy_preloader DESTINATION ${PLUGIN_INSTALL_DIR})
|
|||
|
||||
install(FILES konqy_preload.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
|
||||
install(FILES konqy_preloader.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
|
||||
install(FILES org.kde.konqueror.Preloader.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install(FILES org.kde.konqueror.Preloader.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -57,4 +57,4 @@ install(TARGETS konqueror DESTINATION ${BIN_INSTALL_DIR})
|
|||
########### install files ###############
|
||||
install( FILES konqueror.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
|
||||
install( FILES konqueror.rc konq-simplebrowser.rc DESTINATION ${DATA_INSTALL_DIR}/konqueror )
|
||||
install(FILES org.kde.Konqueror.Main.xml org.kde.Konqueror.MainWindow.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install(FILES org.kde.Konqueror.Main.xml org.kde.Konqueror.MainWindow.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
|
|
@ -17,6 +17,6 @@ install(TARGETS kwrite DESTINATION ${BIN_INSTALL_DIR})
|
|||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kwrite.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
|
||||
|
||||
|
|
|
@ -70,5 +70,5 @@ DESTINATION ${INCLUDE_INSTALL_DIR}
|
|||
)
|
||||
install( FILES konqpopupmenuplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||
|
||||
install( FILES org.kde.libkonq.KonqHistoryManager.xml org.kde.libkonq.UndoManager.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install( FILES org.kde.libkonq.KonqHistoryManager.xml org.kde.libkonq.UndoManager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -16,4 +16,4 @@ if(NOT WIN32)
|
|||
install( PROGRAMS move_favicons.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
||||
endif(NOT WIN32)
|
||||
|
||||
install( FILES org.kde.FavIcon.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install( FILES org.kde.FavIcon.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
|
|
@ -60,7 +60,7 @@ if (X11_Xt_LIB)
|
|||
|
||||
install( FILES khtml_plugins.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
install( FILES nspluginpart.rc DESTINATION ${DATA_INSTALL_DIR}/plugin )
|
||||
install( FILES org.kde.nsplugins.CallBack.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install( FILES org.kde.nsplugins.CallBack.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
||||
add_subdirectory( test )
|
||||
|
||||
|
|
|
@ -20,6 +20,6 @@ kde4_add_executable(nspluginviewer ${nspluginviewer_SRCS})
|
|||
target_link_libraries(nspluginviewer ${KDE4_KPARTS_LIBS} ${X11_Xt_LIB} ${QT_QT3SUPPORT_LIBRARY} )
|
||||
|
||||
install(TARGETS nspluginviewer DESTINATION ${BIN_INSTALL_DIR})
|
||||
install(FILES org.kde.nsplugins.class.xml org.kde.nsplugins.instance.xml org.kde.nsplugins.viewer.xml DESTINATION ${DBUS_INTERFACES_DIR} )
|
||||
install(FILES org.kde.nsplugins.class.xml org.kde.nsplugins.instance.xml org.kde.nsplugins.viewer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue