diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
| commit | c0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch) | |
| tree | 2ba50375d78b077b266b224e4413150ef3e60a15 /languages/python | |
| parent | 33d15e862e09fbcbb05e209f832414bd8a01291e (diff) | |
| download | tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'languages/python')
| -rw-r--r-- | languages/python/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | languages/python/Makefile.am | 2 | ||||
| -rw-r--r-- | languages/python/pydoc.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/languages/python/CMakeLists.txt b/languages/python/CMakeLists.txt index f2e63076..93ba69c2 100644 --- a/languages/python/CMakeLists.txt +++ b/languages/python/CMakeLists.txt @@ -33,7 +33,7 @@ link_directories( ##### other data ################################ install( FILES kdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/kio_pydoc ) +install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc ) install( FILES kdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpythonsupport ) @@ -53,6 +53,6 @@ tde_add_kpart( libkdevpythonsupport AUTOMOC tde_add_kpart( kio_pydoc SOURCES pydoc.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am index bd2e8813..3474eceb 100644 --- a/languages/python/Makefile.am +++ b/languages/python/Makefile.am @@ -21,7 +21,7 @@ kio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO -slavedir = $(kde_datadir)/kio_pydoc +slavedir = $(kde_datadir)/tdeio_pydoc slave_DATA = kde_pydoc.py servicedir = $(kde_servicesdir) diff --git a/languages/python/pydoc.h b/languages/python/pydoc.h index f5e639d7..b4354ca5 100644 --- a/languages/python/pydoc.h +++ b/languages/python/pydoc.h @@ -2,7 +2,7 @@ #define _PYDOC_H_ #include <tqobject.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class PydocProtocol : public TDEIO::SlaveBase |