TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDEHOME and KDEDIR

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 5fa8a1f667
commit 918c3ff077
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

16
INSTALL
Unescape View File

@ -53,7 +53,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
eventually: eventually:
# export KDEDIR="your kde library path" # export TDEDIR="your kde library path"
We're using GNU tools here. We're using GNU tools here.
@ -271,13 +271,13 @@ General notes for the installation of the 3.4.0 release of KVIrc
# export QTDIR="/usr/local/kde/qt" # export QTDIR="/usr/local/kde/qt"
If you want to compile the KDE support you might want to do the same If you want to compile the KDE support you might want to do the same
with KDEDIR with TDEDIR
# export KDEDIR="your kde dir" # export TDEDIR="your kde dir"
In my case KDE is installed in /usr/local/kde so I use In my case KDE is installed in /usr/local/kde so I use
# export KDEDIR="/usr/local/kde" # export TDEDIR="/usr/local/kde"
The configure script has a lot of options that can be listed by using The configure script has a lot of options that can be listed by using
@ -339,15 +339,15 @@ General notes for the installation of the 3.4.0 release of KVIrc
--with-kde-library-dir=<DIR> --with-kde-library-dir=<DIR>
Look for the KDE libraries in <DIR> Look for the KDE libraries in <DIR>
If $KDEDIR points to the right place, you shouldn't need this. If $TDEDIR points to the right place, you shouldn't need this.
--with-kde-include-dir=<DIR> --with-kde-include-dir=<DIR>
Look for the KDE headers in <DIR> Look for the KDE headers in <DIR>
If $KDEDIR points to the right place, you shouldn't need this. If $TDEDIR points to the right place, you shouldn't need this.
--with-kde-services-dir=<DIR> --with-kde-services-dir=<DIR>
Install the kde service protocol files in <DIR> Install the kde service protocol files in <DIR>
If $KDEDIR points to the right place, you shouldn't need this. If $TDEDIR points to the right place, you shouldn't need this.
This is also non-critical for kvirc: if the configure script This is also non-critical for kvirc: if the configure script
can't find this directory, you will only looose the support for can't find this directory, you will only looose the support for
irc:// urls in konqueror irc:// urls in konqueror
@ -666,7 +666,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
# ldconfig # ldconfig
If you have decided to use the KDE support the installation If you have decided to use the KDE support the installation
might have placed all these files in your $KDEDIR tree might have placed all these files in your $TDEDIR tree
instead of /usr/local. In this case you should be OK since instead of /usr/local. In this case you should be OK since
KDE requires its library dir to be in /etc/ld.so.conf KDE requires its library dir to be in /etc/ld.so.conf

10
acinclude.m4
Unescape View File

@ -2146,8 +2146,8 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$HOME"; then if test -n "$HOME"; then
ss_kde_general_test_dirs="$ss_kde_general_test_dirs $HOME $HOME/lib" ss_kde_general_test_dirs="$ss_kde_general_test_dirs $HOME $HOME/lib"
fi fi
if test -n "$KDEDIR"; then if test -n "$TDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$TDEDIR $ss_kde_general_test_dirs"
fi fi
ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ." ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
@ -2170,7 +2170,7 @@ AC_DEFUN([AC_SS_FIND_KDE_SERVICES_DIR],
AC_MSG_CHECKING([for KDE services directory]) AC_MSG_CHECKING([for KDE services directory])
ss_kde_services_test_dirs="/usr/share/services /usr/local/share/services /usr/kde/share/services /usr/local/kde/share/services /usr/X11R6/share/services /opt/kde/share/services /usr/lib/kde/share/services" ss_kde_services_test_dirs="/usr/share/services /usr/local/share/services /usr/kde/share/services /usr/local/kde/share/services /usr/X11R6/share/services /opt/kde/share/services /usr/lib/kde/share/services"
test -n "$KDEDIR" && ss_kde_services_test_dirs="$KDEDIR/share/services $ss_kde_services_test_dirs" test -n "$TDEDIR" && ss_kde_services_test_dirs="$TDEDIR/share/services $ss_kde_services_test_dirs"
ss_kde_services_test_dirs="$ss_kde_services_test_dirs /usr/share/kde/services" ss_kde_services_test_dirs="$ss_kde_services_test_dirs /usr/share/kde/services"
test -n "$SS_KDE_GENERAL_DIR" && ss_kde_services_test_dirs="$SS_KDE_GENERAL_DIR/share/services $ss_kde_services_test_dirs" test -n "$SS_KDE_GENERAL_DIR" && ss_kde_services_test_dirs="$SS_KDE_GENERAL_DIR/share/services $ss_kde_services_test_dirs"
@ -2197,7 +2197,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
AC_MSG_CHECKING([for KDE header files]) AC_MSG_CHECKING([for KDE header files])
ss_kde_include_test_dirs="/include /usr/include /usr/local/include /usr/kde/include /usr/local/kde/include /usr/X11R6/include /opt/kde/include /usr/lib/kde/include /usr/lib/kde /usr/include/X11" ss_kde_include_test_dirs="/include /usr/include /usr/local/include /usr/kde/include /usr/local/kde/include /usr/X11R6/include /opt/kde/include /usr/lib/kde/include /usr/lib/kde /usr/include/X11"
test -n "$KDEDIR" && ss_kde_include_test_dirs="$KDEDIR/include $KDEDIR $ss_kde_include_test_dirs" test -n "$TDEDIR" && ss_kde_include_test_dirs="$TDEDIR/include $TDEDIR $ss_kde_include_test_dirs"
ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include" ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include"
ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2" ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2"
test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs" test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs"
@ -2229,7 +2229,7 @@ AC_DEFUN([AC_SS_FIND_KDE_LIBRARY_DIR],
AC_MSG_CHECKING([for the KDE libraries]) AC_MSG_CHECKING([for the KDE libraries])
ss_kde_library_test_dirs="/lib /usr/lib /usr/local/lib /usr/kde/lib /opt/kde/lib /opt/lib /usr/opt/kde/lib /usr/local/kde/lib /usr/X11R6/lib /usr/lib/kde/lib /usr/lib/kde /usr/local/lib/kde/lib" ss_kde_library_test_dirs="/lib /usr/lib /usr/local/lib /usr/kde/lib /opt/kde/lib /opt/lib /usr/opt/kde/lib /usr/local/kde/lib /usr/X11R6/lib /usr/lib/kde/lib /usr/lib/kde /usr/local/lib/kde/lib"
test -n "$KDEDIR" && ss_kde_library_test_dirs="$KDEDIR/lib $KDEDIR $ss_kde_library_test_dirs" test -n "$TDEDIR" && ss_kde_library_test_dirs="$TDEDIR/lib $TDEDIR $ss_kde_library_test_dirs"
ss_kde_library_test_dirs="$ss_kde_library_test_dirs /usr/local/lib/kde /usr/X11R6/lib/kde /usr/build/kde/lib" ss_kde_library_test_dirs="$ss_kde_library_test_dirs /usr/local/lib/kde /usr/X11R6/lib/kde /usr/build/kde/lib"
if test -n "$SS_KDE_GENERAL_DIR"; then if test -n "$SS_KDE_GENERAL_DIR"; then
ss_kde_library_test_dirs="$SS_KDE_GENERAL_DIR/lib $ss_kde_library_test_dirs" ss_kde_library_test_dirs="$SS_KDE_GENERAL_DIR/lib $ss_kde_library_test_dirs"

10
admin/acinclude.m4.in
Unescape View File

@ -2173,8 +2173,8 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$HOME"; then if test -n "$HOME"; then
ss_kde_general_test_dirs="$ss_kde_general_test_dirs $HOME $HOME/lib" ss_kde_general_test_dirs="$ss_kde_general_test_dirs $HOME $HOME/lib"
fi fi
if test -n "$KDEDIR"; then if test -n "$TDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$TDEDIR $ss_kde_general_test_dirs"
fi fi
ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ." ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
@ -2197,7 +2197,7 @@ AC_DEFUN([AC_SS_FIND_KDE_SERVICES_DIR],
AC_MSG_CHECKING([for KDE services directory]) AC_MSG_CHECKING([for KDE services directory])
ss_kde_services_test_dirs="/usr/share/services /usr/local/share/services /usr/kde/share/services /usr/local/kde/share/services /usr/X11R6/share/services /opt/kde/share/services /usr/lib/kde/share/services" ss_kde_services_test_dirs="/usr/share/services /usr/local/share/services /usr/kde/share/services /usr/local/kde/share/services /usr/X11R6/share/services /opt/kde/share/services /usr/lib/kde/share/services"
test -n "$KDEDIR" && ss_kde_services_test_dirs="$KDEDIR/share/services $ss_kde_services_test_dirs" test -n "$TDEDIR" && ss_kde_services_test_dirs="$TDEDIR/share/services $ss_kde_services_test_dirs"
ss_kde_services_test_dirs="$ss_kde_services_test_dirs /usr/share/kde/services" ss_kde_services_test_dirs="$ss_kde_services_test_dirs /usr/share/kde/services"
test -n "$SS_KDE_GENERAL_DIR" && ss_kde_services_test_dirs="$SS_KDE_GENERAL_DIR/share/services $ss_kde_services_test_dirs" test -n "$SS_KDE_GENERAL_DIR" && ss_kde_services_test_dirs="$SS_KDE_GENERAL_DIR/share/services $ss_kde_services_test_dirs"
@ -2224,7 +2224,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
AC_MSG_CHECKING([for KDE header files]) AC_MSG_CHECKING([for KDE header files])
ss_kde_include_test_dirs="/include /usr/include /usr/local/include /usr/kde/include /usr/local/kde/include /usr/X11R6/include /opt/kde/include /usr/lib/kde/include /usr/lib/kde /usr/include/X11" ss_kde_include_test_dirs="/include /usr/include /usr/local/include /usr/kde/include /usr/local/kde/include /usr/X11R6/include /opt/kde/include /usr/lib/kde/include /usr/lib/kde /usr/include/X11"
test -n "$KDEDIR" && ss_kde_include_test_dirs="$KDEDIR/include $KDEDIR $ss_kde_include_test_dirs" test -n "$TDEDIR" && ss_kde_include_test_dirs="$TDEDIR/include $TDEDIR $ss_kde_include_test_dirs"
ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include" ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include"
ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2" ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2"
test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs" test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs"
@ -2256,7 +2256,7 @@ AC_DEFUN([AC_SS_FIND_KDE_LIBRARY_DIR],
AC_MSG_CHECKING([for the KDE libraries]) AC_MSG_CHECKING([for the KDE libraries])
ss_kde_library_test_dirs="/lib /usr/lib /usr/local/lib /usr/kde/lib /opt/kde/lib /opt/lib /usr/opt/kde/lib /usr/local/kde/lib /usr/X11R6/lib /usr/lib/kde/lib /usr/lib/kde /usr/local/lib/kde/lib" ss_kde_library_test_dirs="/lib /usr/lib /usr/local/lib /usr/kde/lib /opt/kde/lib /opt/lib /usr/opt/kde/lib /usr/local/kde/lib /usr/X11R6/lib /usr/lib/kde/lib /usr/lib/kde /usr/local/lib/kde/lib"
test -n "$KDEDIR" && ss_kde_library_test_dirs="$KDEDIR/lib $KDEDIR $ss_kde_library_test_dirs" test -n "$TDEDIR" && ss_kde_library_test_dirs="$TDEDIR/lib $TDEDIR $ss_kde_library_test_dirs"
ss_kde_library_test_dirs="$ss_kde_library_test_dirs /usr/local/lib/kde /usr/X11R6/lib/kde /usr/build/kde/lib" ss_kde_library_test_dirs="$ss_kde_library_test_dirs /usr/local/lib/kde /usr/X11R6/lib/kde /usr/build/kde/lib"
if test -n "$SS_KDE_GENERAL_DIR"; then if test -n "$SS_KDE_GENERAL_DIR"; then
ss_kde_library_test_dirs="$SS_KDE_GENERAL_DIR/lib $ss_kde_library_test_dirs" ss_kde_library_test_dirs="$SS_KDE_GENERAL_DIR/lib $ss_kde_library_test_dirs"

14
src/kvirc/kernel/kvi_app_setup.cpp
Unescape View File

@ -546,11 +546,11 @@ void KviApp::findGlobalKvircDirectory()
#else // !COMPILE_ON_WINDOWS #else // !COMPILE_ON_WINDOWS
// Since I had many problems with it // Since I had many problems with it
// because of strange distributions or KDEDIRS // because of strange distributions or TDEDIRS
// I do it in that way... // I do it in that way...
#ifdef COMPILE_KDE_SUPPORT #ifdef COMPILE_KDE_SUPPORT
// KDE compilation ... // KDE compilation ...
// The things usually go installed into $KDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH // The things usually go installed into $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
// Look in the main KDE directory // Look in the main KDE directory
KStandardDirs * d = dirs(); KStandardDirs * d = dirs();
if(d) if(d)
@ -558,8 +558,8 @@ void KviApp::findGlobalKvircDirectory()
m_szGlobalKvircDir = locate("appdata",""); m_szGlobalKvircDir = locate("appdata","");
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
#ifdef HAVE_GETENV #ifdef HAVE_GETENV
//KDEDIR sanity check... //TDEDIR sanity check...
m_szGlobalKvircDir = getenv("KDEDIR"); m_szGlobalKvircDir = getenv("TDEDIR");
m_szGlobalKvircDir+="/share/apps/kvirc/" KVI_VERSION_BRANCH; m_szGlobalKvircDir+="/share/apps/kvirc/" KVI_VERSION_BRANCH;
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
#endif #endif
@ -567,7 +567,7 @@ void KviApp::findGlobalKvircDirectory()
// FAILED ? Check the usual way... // FAILED ? Check the usual way...
#endif //COMPILE_WITH_KDE #endif //COMPILE_WITH_KDE
// Non KDE compilation , or not found under $KDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH // Non KDE compilation , or not found under $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
// Check for MacOS X Bundle compilation // Check for MacOS X Bundle compilation
#ifdef Q_OS_MACX #ifdef Q_OS_MACX
@ -613,10 +613,10 @@ void KviApp::findGlobalKvircDirectory()
#ifdef COMPILE_KDE_SUPPORT #ifdef COMPILE_KDE_SUPPORT
KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\ KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
"The usual path for this directory is $KDEDIR/share/apps/kvirc.\n"\ "The usual path for this directory is $TDEDIR/share/apps/kvirc.\n"\
"Are you sure that 'make install' worked correctly ?\n"\ "Are you sure that 'make install' worked correctly ?\n"\
"Please make sure that you have the read permission to that directory\n"\ "Please make sure that you have the read permission to that directory\n"\
"and you have set KDEDIR correctly. You may also try to rerun 'make install'.\n"\ "and you have set TDEDIR correctly. You may also try to rerun 'make install'.\n"\
"A detailed explaination of the Kvirc directory system is in the INSTALL document\n"\ "A detailed explaination of the Kvirc directory system is in the INSTALL document\n"\
"shipped with the kvirc source dirstribution.\n"\ "shipped with the kvirc source dirstribution.\n"\
"Trying to run anyway..."); "Trying to run anyway...");

Write Preview
Loading…
Cancel
Save