From c13acd3c8d18c9606e49f566adb5974417530878 Mon Sep 17 00:00:00 2001
From: Timothy Pearson
Date: Wed, 7 Dec 2011 19:03:55 -0600
Subject: Rename KDEHOME and KDEDIR
---
tde-i18n-wa/acinclude.m4 | 26 +++++++++++++-------------
tde-i18n-wa/configure | 26 +++++++++++++-------------
tde-i18n-wa/configure.in | 2 +-
tde-i18n-wa/messages/tdebase/kcmfonts.po | 4 ++--
tde-i18n-wa/messages/tdebase/kcmkicker.po | 2 +-
tde-i18n-wa/messages/tdeedu/klettres.po | 8 ++++----
6 files changed, 34 insertions(+), 34 deletions(-)
(limited to 'tde-i18n-wa')
diff --git a/tde-i18n-wa/acinclude.m4 b/tde-i18n-wa/acinclude.m4
index 7d9fdee4132..bf9647ca6d6 100644
--- a/tde-i18n-wa/acinclude.m4
+++ b/tde-i18n-wa/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/kde3/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/kde3/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/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/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
@@ -4973,12 +4973,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
@@ -5002,7 +5002,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/tde-i18n-wa/configure b/tde-i18n-wa/configure
index a4c275f80c6..c439cc12ca7 100755
--- a/tde-i18n-wa/configure
+++ b/tde-i18n-wa/configure
@@ -577,7 +577,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=
ac_unique_file="messages/Makefile.am"
-ac_default_prefix=${KDEDIR:-the kde prefix}
+ac_default_prefix=${TDEDIR:-the kde prefix}
ac_subst_vars='SHELL
PATH_SEPARATOR
PACKAGE_NAME
@@ -2623,13 +2623,13 @@ For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; }
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
@@ -2925,13 +2925,13 @@ For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; }
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
@@ -3038,11 +3038,11 @@ _ACEOF
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/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
@@ -3690,7 +3690,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
KDE_XSL_STYLESHEET=NO
for i in $kde_sharedirs;
@@ -3738,11 +3738,11 @@ done
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/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
@@ -5419,7 +5419,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/tde-i18n-wa/configure.in b/tde-i18n-wa/configure.in
index d76d93ce953..26483e04350 100644
--- a/tde-i18n-wa/configure.in
+++ b/tde-i18n-wa/configure.in
@@ -40,7 +40,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/tde-i18n-wa/messages/tdebase/kcmfonts.po b/tde-i18n-wa/messages/tdebase/kcmfonts.po
index 4f7ead3de2a..9f062ae4565 100644
--- a/tde-i18n-wa/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-wa/messages/tdebase/kcmfonts.po
@@ -187,7 +187,7 @@ msgid ""
"The use of this option is generally discouraged. For selecting proper DPI "
"value a better option is explicitly configuring it for the whole X server if "
"possible (e.g. DisplaySize in xorg.conf or adding -dpi value "
-"to ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not "
+"to ServerLocalArgs= in $TDEDIR/share/config/kdm/kdmrc). When fonts do not "
"render properly with real DPI value better fonts should be used or "
"configuration of font hinting should be checked.
"
msgstr ""
@@ -200,7 +200,7 @@ msgstr ""
"l' sierveu X, po tos les programes (eg mete DisplaySize dins l' fitchî "
"d' apontiaedje xorg.conf oudonbén radjouter -dpi valixhance "
"al roye ServerLocalArgs= do fitchî d' apontiaedje "
-"$KDEDIR/share/config/kdm/kdmrc). Cwand des fontes ni si håynèt nén bén avou "
+"$TDEDIR/share/config/kdm/kdmrc). Cwand des fontes ni si håynèt nén bén avou "
"l' vraiye valixhance del finté del waitroûle c' est mia d' cweri après des "
"meyeusès fontes, ou verifyî l' apontiaedje do «hinting».
"
diff --git a/tde-i18n-wa/messages/tdebase/kcmkicker.po b/tde-i18n-wa/messages/tdebase/kcmkicker.po
index 74ae44db09d..cf3a9dda052 100644
--- a/tde-i18n-wa/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-wa/messages/tdebase/kcmkicker.po
@@ -991,7 +991,7 @@ msgid ""
" "
"Tip: You can customize the image that appears in the K Menu by "
"putting an image file called kside.png and a tileable image file called "
-"kside_tile.png in $KDEHOME/share/apps/kicker/pics."
+"kside_tile.png in $TDEHOME/share/apps/kicker/pics."
msgstr ""
#. i18n: file menutab.ui line 151
diff --git a/tde-i18n-wa/messages/tdeedu/klettres.po b/tde-i18n-wa/messages/tdeedu/klettres.po
index 4f0a3f70f59..c06d85e31f7 100644
--- a/tde-i18n-wa/messages/tdeedu/klettres.po
+++ b/tde-i18n-wa/messages/tdeedu/klettres.po
@@ -49,13 +49,13 @@ msgstr "Ouganda"
#: klettres.cpp:177
msgid ""
"The file sounds.xml was not found in\n"
-"$KDEDIR/share/apps/klettres/\n"
+"$TDEDIR/share/apps/klettres/\n"
"\n"
"Please install this file and start KLettres again.\n"
"\n"
msgstr ""
"Li fitchî sounds.xml n' a nén stî trové el ridant\n"
-"$KDEDIR/share/apps/klettres/\n"
+"$TDEDIR/share/apps/klettres/\n"
"\n"
"Astalez ci fitchî la et s' renondez KLetes s' i vs plait.\n"
"\n"
@@ -229,10 +229,10 @@ msgstr "Discandjî a môde crexhou efant"
#: klettres.cpp:461
msgid ""
-"File $KDEDIR/share/apps/klettres/%1.txt not found;\n"
+"File $TDEDIR/share/apps/klettres/%1.txt not found;\n"
"please check your installation."
msgstr ""
-"Li fitchî $KDEDIR/share/apps/klettres/%1.txt èn pola nén esse trové.\n"
+"Li fitchî $TDEDIR/share/apps/klettres/%1.txt èn pola nén esse trové.\n"
"Verifyîz vost astalaedje s' i vs plait."
#: klettres.cpp:478
--
cgit v1.2.1