diff options
| author | Timothy Pearson <[email protected]> | 2012-05-10 15:40:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-05-10 15:40:22 -0500 |
| commit | 136d2c861321d51ac3ab1ab82ca602717158c766 (patch) | |
| tree | 5c47ff80add8df4ce045a8956f96661c4893a0c8 /src | |
| parent | 51ff06f0c1c6981694fe60a20870de26749b895f (diff) | |
| download | kvirc-136d2c861321d51ac3ab1ab82ca602717158c766.tar.gz kvirc-136d2c861321d51ac3ab1ab82ca602717158c766.zip | |
Update Automake to properly detect TDE path
Thanks to Slávek Banko for the initial patch!
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 1 | ||||
| -rw-r--r-- | src/modules/mediaplayer/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/torrent/Makefile.am | 2 |
4 files changed, 4 insertions, 3 deletions
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 \ |