summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m426
-rw-r--r--configure.in2
-rw-r--r--doc/de/handbook.mobin28378 -> 28378 bytes
-rw-r--r--doc/de/handbook.po8
-rw-r--r--doc/de/index.docbook8
-rw-r--r--doc/en/handbook.pot4
-rw-r--r--doc/en/index.docbook8
-rw-r--r--doc/fr/handbook.po8
-rw-r--r--doc/fr/index.docbook8
-rw-r--r--doc/fr/index.docbook.old4
-rw-r--r--doc/sv/handbook.po8
-rw-r--r--doc/sv/index.docbook8
-rw-r--r--kvpnc.kdevelop2
13 files changed, 47 insertions, 47 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ad094b1..e9981a7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -382,13 +382,13 @@ same compiler to compile Qt and kdelibs 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=""
@@ -1794,7 +1794,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"
@@ -1806,7 +1806,7 @@ So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $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"
@@ -3549,7 +3549,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
@@ -4946,12 +4946,12 @@ AC_DEFUN([KDE_CONF_FILES],
dnl This sets the prefix, for arts and kdelibs
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
@@ -4975,7 +4975,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 9337c3b..80f17f8 100644
--- a/configure.in
+++ b/configure.in
@@ -98,7 +98,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/doc/de/handbook.mo b/doc/de/handbook.mo
index ac4d603..af8f0b4 100644
--- a/doc/de/handbook.mo
+++ b/doc/de/handbook.mo
Binary files differ
diff --git a/doc/de/handbook.po b/doc/de/handbook.po
index 04d1694..5a308ee 100644
--- a/doc/de/handbook.po
+++ b/doc/de/handbook.po
@@ -1382,17 +1382,17 @@ msgstr "Bemerkung für Gentoo- und nicht-Standard-KDE-Benutzer:"
#: index.docbook:619 index.docbook:637
#, no-c-format
msgid ""
-"You have to export the KDEDIR variable in order to compile and install kvpnc "
+"You have to export the TDEDIR variable in order to compile and install kvpnc "
"properly, usually it is done by :"
msgstr ""
-"Es muss die KDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu "
+"Es muss die TDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu "
"kompilieren und installieren. Dies wird überlicherweise erreicht durch:"
#. Tag: command
#: index.docbook:620 index.docbook:638
#, no-c-format
-msgid "KDEDIR=/usr/kde/3.x/"
-msgstr "KDEDIR=/usr/kde/3.x/"
+msgid "TDEDIR=/usr/kde/3.x/"
+msgstr "TDEDIR=/usr/kde/3.x/"
#. Tag: para
#: index.docbook:624 index.docbook:643
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
index c6e04f9..f1d96bb 100644
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
@@ -1155,10 +1155,10 @@ distribution. -->
<para
>Bemerkung für Gentoo- und nicht-Standard-KDE-Benutzer:</para>
<para
->Es muss die KDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu kompilieren und installieren. Dies wird überlicherweise erreicht durch:</para>
+>Es muss die TDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu kompilieren und installieren. Dies wird überlicherweise erreicht durch:</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
@@ -1207,10 +1207,10 @@ distribution. -->
<para
>Bemerkung für Gentoo- und nicht-Standard-KDE-Benutzer:</para>
<para
->Es muss die KDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu kompilieren und installieren. Dies wird überlicherweise erreicht durch:</para>
+>Es muss die TDEDIR-Umgebungsvariable gesetzt werden, um &kvpnc; richtig zu kompilieren und installieren. Dies wird überlicherweise erreicht durch:</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
diff --git a/doc/en/handbook.pot b/doc/en/handbook.pot
index 3a07e43..d69c2f7 100644
--- a/doc/en/handbook.pot
+++ b/doc/en/handbook.pot
@@ -1127,13 +1127,13 @@ msgstr ""
#. Tag: para
#: index.docbook:619 index.docbook:637
#, no-c-format
-msgid "You have to export the KDEDIR variable in order to compile and install kvpnc properly, usually it is done by :"
+msgid "You have to export the TDEDIR variable in order to compile and install kvpnc properly, usually it is done by :"
msgstr ""
#. Tag: command
#: index.docbook:620 index.docbook:638
#, no-c-format
-msgid "KDEDIR=/usr/kde/3.x/"
+msgid "TDEDIR=/usr/kde/3.x/"
msgstr ""
#. Tag: para
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 3f6a1a1..73620b0 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -616,8 +616,8 @@ Packagers:
<para><command>exit</command></para>
<para></para>
<para>Note to Gentoo and non usual KDE prefix users :</para>
-<para>You have to export the KDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
-<para><command>KDEDIR=/usr/kde/3.x/</command></para>
+<para>You have to export the TDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
+<para><command>TDEDIR=/usr/kde/3.x/</command></para>
<para><command>./configure</command></para>
@@ -634,8 +634,8 @@ Packagers:
<para><command>exit</command></para>
<para></para>
<para>Note to Gentoo and non usual KDE prefix users :</para>
-<para>You have to export the KDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
-<para><command>KDEDIR=/usr/kde/3.x/</command></para>
+<para>You have to export the TDEDIR variable in order to compile and install kvpnc properly, usually it is done by :</para>
+<para><command>TDEDIR=/usr/kde/3.x/</command></para>
<para><command>./configure</command></para>
diff --git a/doc/fr/handbook.po b/doc/fr/handbook.po
index ec5e458..6261200 100644
--- a/doc/fr/handbook.po
+++ b/doc/fr/handbook.po
@@ -1368,17 +1368,17 @@ msgstr ""
#: index.docbook:619 index.docbook:637
#, no-c-format
msgid ""
-"You have to export the KDEDIR variable in order to compile and install kvpnc "
+"You have to export the TDEDIR variable in order to compile and install kvpnc "
"properly, usually it is done by :"
msgstr ""
-"Vous devez exporter la variable KDEDIR afin de compiler et d'installer kvpnc "
+"Vous devez exporter la variable TDEDIR afin de compiler et d'installer kvpnc "
"proprement, procédez ainsi :"
#. Tag: command
#: index.docbook:620 index.docbook:638
#, no-c-format
-msgid "KDEDIR=/usr/kde/3.x/"
-msgstr "KDEDIR=/usr/kde/3.x/"
+msgid "TDEDIR=/usr/kde/3.x/"
+msgstr "TDEDIR=/usr/kde/3.x/"
#. Tag: para
#: index.docbook:624 index.docbook:643
diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook
index 3a11494..1e5e26b 100644
--- a/doc/fr/index.docbook
+++ b/doc/fr/index.docbook
@@ -1159,10 +1159,10 @@ distribution. -->
<para
>Note aux utilisateurs Gentoo et ceux qui n'ont pas KDE dans un préfixe usuel :</para>
<para
->Vous devez exporter la variable KDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
+>Vous devez exporter la variable TDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
@@ -1211,10 +1211,10 @@ distribution. -->
<para
>Note aux utilisateurs Gentoo et ceux qui n'ont pas KDE dans un préfixe usuel :</para>
<para
->Vous devez exporter la variable KDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
+>Vous devez exporter la variable TDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
diff --git a/doc/fr/index.docbook.old b/doc/fr/index.docbook.old
index b6a3e5e..2cf3d87 100644
--- a/doc/fr/index.docbook.old
+++ b/doc/fr/index.docbook.old
@@ -1052,10 +1052,10 @@ distribution. -->
<para
>Note aux utilisateurs Gentoo et ceux qui n'ont pas KDE dans un préfixe usuel :</para>
<para
->Vous devez exporter la variable KDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
+>Vous devez exporter la variable TDEDIR afin de compiler et d'installer kvpnc proprement, procédez ainsi :</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
diff --git a/doc/sv/handbook.po b/doc/sv/handbook.po
index 1b7513e..f8f20f1 100644
--- a/doc/sv/handbook.po
+++ b/doc/sv/handbook.po
@@ -1358,17 +1358,17 @@ msgstr "Notering till Gentoo och användare med onormala KDE-prefix:"
#: index.docbook:619 index.docbook:637
#, no-c-format
msgid ""
-"You have to export the KDEDIR variable in order to compile and install kvpnc "
+"You have to export the TDEDIR variable in order to compile and install kvpnc "
"properly, usually it is done by :"
msgstr ""
-"Du måste exportera variabeln KDEDIR för att kompilera och installera kvpnc "
+"Du måste exportera variabeln TDEDIR för att kompilera och installera kvpnc "
"korrekt, normalt sett görs detta genom att:"
#. Tag: command
#: index.docbook:620 index.docbook:638
#, no-c-format
-msgid "KDEDIR=/usr/kde/3.x/"
-msgstr "KDEDIR=/usr/kde/3.x/"
+msgid "TDEDIR=/usr/kde/3.x/"
+msgstr "TDEDIR=/usr/kde/3.x/"
#. Tag: para
#: index.docbook:624 index.docbook:643
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 46a6e0b..04c09f8 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -1141,10 +1141,10 @@ distribution. -->
<para
>Notering till Gentoo och användare med onormala KDE-prefix:</para>
<para
->Du måste exportera variabeln KDEDIR för att kompilera och installera kvpnc korrekt, normalt sett görs detta genom att:</para>
+>Du måste exportera variabeln TDEDIR för att kompilera och installera kvpnc korrekt, normalt sett görs detta genom att:</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
@@ -1193,10 +1193,10 @@ distribution. -->
<para
>Notering till Gentoo och användare med onormala KDE-prefix:</para>
<para
->Du måste exportera variabeln KDEDIR för att kompilera och installera kvpnc korrekt, normalt sett görs detta genom att:</para>
+>Du måste exportera variabeln TDEDIR för att kompilera och installera kvpnc korrekt, normalt sett görs detta genom att:</para>
<para
><command
->KDEDIR=/usr/kde/3.x/</command
+>TDEDIR=/usr/kde/3.x/</command
></para>
<para
><command
diff --git a/kvpnc.kdevelop b/kvpnc.kdevelop
index f230f9a..060bda3 100644
--- a/kvpnc.kdevelop
+++ b/kvpnc.kdevelop
@@ -137,7 +137,7 @@
<configurations>
<default>
<envvars>
- <envvar value="/usr" name="KDEDIR" />
+ <envvar value="/usr" name="TDEDIR" />
<envvar value="/usr/lib/qt3" name="QTDIR" />
</envvars>
<configargs>--enable-debug=full</configargs>