diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /khotkeys/update | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/update')
| -rw-r--r-- | khotkeys/update/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | khotkeys/update/Makefile.am | 4 | ||||
| -rw-r--r-- | khotkeys/update/update.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/khotkeys/update/CMakeLists.txt b/khotkeys/update/CMakeLists.txt index 13a7dffca..32cbb9fc0 100644 --- a/khotkeys/update/CMakeLists.txt +++ b/khotkeys/update/CMakeLists.txt @@ -27,5 +27,5 @@ link_directories( tde_add_executable( khotkeys_update SOURCES update.cpp LINK khotkeys_shared-shared - DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin + DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin ) diff --git a/khotkeys/update/Makefile.am b/khotkeys/update/Makefile.am index 19e725d8a..be0e97f9d 100644 --- a/khotkeys/update/Makefile.am +++ b/khotkeys/update/Makefile.am @@ -1,5 +1,5 @@ -kconf_PROGRAMS = khotkeys_update -kconfdir = $(libdir)/kconf_update_bin +tdeconf_PROGRAMS = khotkeys_update +tdeconfdir = $(libdir)/tdeconf_update_bin khotkeys_update_SOURCES = update.cpp diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 1d4f26b45..2ed07c991 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -17,7 +17,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <dcopclient.h> |