summaryrefslogtreecommitdiffstats
path: root/kate/data
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /kate/data
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kate/data')
-rw-r--r--kate/data/CMakeLists.txt2
-rw-r--r--kate/data/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index fb4b28d03..b81ead948 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -15,5 +15,5 @@ install( FILES kateplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate )
install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
-install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} )
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 77bba0d1d..149406426 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -12,7 +12,7 @@ rckwrite_DATA = kwriteui.rc
tipdir = $(kde_datadir)/kate
tip_DATA = tips
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kate-2.4.upd
kde_conf_DATA = katerc