From 136d2c861321d51ac3ab1ab82ca602717158c766 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 10 May 2012 15:40:22 -0500
Subject: =?UTF-8?q?Update=20Automake=20to=20properly=20detect=20TDE=20path?=
 =?UTF-8?q?=20Thanks=20to=20Sl=C3=A1vek=20Banko=20for=20the=20initial=20pa?=
 =?UTF-8?q?tch!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/kvirc/kernel/kvi_app_fs.cpp     | 2 +-
 src/kvirc/kernel/kvi_app_setup.cpp  | 1 +
 src/modules/mediaplayer/Makefile.am | 2 +-
 src/modules/torrent/Makefile.am     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index ad8ce5ab..42d23706 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -55,7 +55,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
 
 		// Local hack for Debian
 		case Modules       :
-		case Plugins       : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/modules";                 break;
+		case Plugins       : szData = TDE_LIBDIR "/kvirc/" KVI_VERSION_BRANCH "/modules";               break;
 
 		case EasyPlugins   : szData.append("easyplugins");                                             break;
 		case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index b54760b8..77ad3af7 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -500,6 +500,7 @@ void KviApp::setupFileAssociations()
 #ifndef COMPILE_ON_WINDOWS
 	const char * usualKvircGlobalPrePath[]=
 	{
+		TDE_DIR,
 		"/usr/local",       "/opt/kde",       "/usr",
 		"/usr/local/lib",   "/opt/kde3",      "/usr/lib",
 		"/usr/local/kde",   "/opt",           "/usr/etc",
diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am
index af5caa60..41e5b850 100644
--- a/src/modules/mediaplayer/Makefile.am
+++ b/src/modules/mediaplayer/Makefile.am
@@ -10,7 +10,7 @@ pluglib_LTLIBRARIES      = libkvimediaplayer.la
 #%.moc: %.h
 #	$(SS_QT_MOC) $< -o $@
 
-libkvimediaplayer_la_LDFLAGS = -avoid-version -module
+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
 		mp_amarokinterface.cpp \
diff --git a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am
index ab0d80cb..fff58478 100644
--- a/src/modules/torrent/Makefile.am
+++ b/src/modules/torrent/Makefile.am
@@ -10,7 +10,7 @@ pluglib_LTLIBRARIES      = libkvitorrent.la
 #%.moc: %.h
 #	$(SS_QT_MOC) $< -o $@
 
-libkvitorrent_la_LDFLAGS = -avoid-version -module
+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvitorrent_la_SOURCES = libkvitorrent.cpp \
 		tc_interface.cpp \
-- 
cgit v1.2.1