From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:16:20 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 khelpcenter/htmlsearch/Makefile.am       | 8 ++++----
 khelpcenter/htmlsearch/index.cpp         | 2 +-
 khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'khelpcenter/htmlsearch')

diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am
index f0459d339..132be449b 100644
--- a/khelpcenter/htmlsearch/Makefile.am
+++ b/khelpcenter/htmlsearch/Makefile.am
@@ -21,14 +21,14 @@ noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h
 
 xdg_apps_DATA = htmlsearch.desktop
 
-bin_PROGRAMS = khtmlindex
+bin_PROGRAMS = tdehtmlindex
 
 wrapperdir = $(kde_datadir)/khelpcenter/
 wrapper_SCRIPTS = meinproc_wrapper
 
-khtmlindex_SOURCES = index.cpp
-khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-khtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
+tdehtmlindex_SOURCES = index.cpp
+tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
 
 xpm_DATA = unchecked.xpm checked.xpm
 xpmdir = $(kde_datadir)/khelpcenter/pics
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index 82bf23689..3cc356d52 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -15,7 +15,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
+  TDEAboutData aboutData( "tdehtmlindex", I18N_NOOP("KHtmlIndex"),
 	"",
 	I18N_NOOP("TDE Index generator for help files."));
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 588be7142..0fdfde831 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex()
 {
   save();
 
-  TQString exe = kapp->dirs()->findExe("khtmlindex");
+  TQString exe = kapp->dirs()->findExe("tdehtmlindex");
   if (exe.isEmpty())
     return;
 
-- 
cgit v1.2.1