summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-07 18:56:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-07 18:56:20 -0600
commit6f2d7da6faf2a1a44cb99413e485963c91d1ea4e (patch)
tree165e75df7eadb9d487d6b0660f33887e5708e273
parent7e056f70bc882ce03a4c007ef12b20270e324e8c (diff)
downloadkipi-plugins-6f2d7da6faf2a1a44cb99413e485963c91d1ea4e.tar.gz
kipi-plugins-6f2d7da6faf2a1a44cb99413e485963c91d1ea4e.zip
Rename KDEHOME and KDEDIR
-rw-r--r--acinclude.m426
-rw-r--r--configure.in2
-rw-r--r--kipi-plugins/htmlexport/THEME_HOWTO4
-rw-r--r--kipi-plugins/simpleviewerexport/simpleviewerexport.cpp4
4 files changed, 18 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 42240cc..6c1e665 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -382,13 +382,13 @@ same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
fi
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes
KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
- if test -n "$KDEDIRS"; then
+ test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+ if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
- for dir in $KDEDIRS; do
+ for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -1818,7 +1818,7 @@ fi
if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
@@ -1830,7 +1830,7 @@ So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -3574,7 +3574,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@@ -4975,12 +4975,12 @@ AC_DEFUN([KDE_CONF_FILES],
dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
[
unset CDPATH
- dnl make $KDEDIR the default for the installation
- AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+ dnl make $TDEDIR the default for the installation
+ AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@@ -5004,7 +5004,7 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH
dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway.
- AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+ AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
diff --git a/configure.in b/configure.in
index 62ffdd1..e4cfca3 100644
--- a/configure.in
+++ b/configure.in
@@ -823,7 +823,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+ echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi
diff --git a/kipi-plugins/htmlexport/THEME_HOWTO b/kipi-plugins/htmlexport/THEME_HOWTO
index f5b439e..878a453 100644
--- a/kipi-plugins/htmlexport/THEME_HOWTO
+++ b/kipi-plugins/htmlexport/THEME_HOWTO
@@ -56,7 +56,7 @@ themes, KDE translators will translate the desktop file for you.
## Getting started: creating one theme from another
The easiest way to get started is to copy one theme and modify it. Theme folders
-can be found in $KDEDIR/share/apps/kipiplugin_htmlexport/themes/, where $KDEDIR
+can be found in $TDEDIR/share/apps/kipiplugin_htmlexport/themes/, where $TDEDIR
is the install folder of KDE on your machine (usually /usr or /opt/trinity).
Writing in this folder requires root access, so we will not create our theme
there, instead do the following:
@@ -71,7 +71,7 @@ Cd to it:
Copy the "snow" theme to this folder, under a new name: "snow2":
- cp -r $KDEDIR/share/apps/kipiplugin_htmlexport/themes/snow snow2
+ cp -r $TDEDIR/share/apps/kipiplugin_htmlexport/themes/snow snow2
Rename the desktop file accordingly:
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 047dc26..9c9fe3d 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -572,7 +572,7 @@ bool SimpleViewerExport::copySimpleViewer()
TQString dataDir;
- // Due to its license, simpleviewer is installed in $KDEHOME
+ // Due to its license, simpleviewer is installed in $TDEHOME
dataDir = locate("data", "kipiplugin_simpleviewerexport/simpleviewer/");
if(dataDir.isEmpty())
installSimpleViewer();
@@ -590,7 +590,7 @@ bool SimpleViewerExport::copySimpleViewer()
files.append(dir.absPath() + "/" + *it);
}
- // files distributed with the plugin are installed in $KDEDIRS
+ // files distributed with the plugin are installed in $TDEDIRS
dataDir = locate("data", "kipiplugin_simpleviewerexport/simpleviewer_html/");
dir.setPath(dataDir);
entries = dir.entryList(TQDir::Files);