summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-26 14:21:44 -0600
committerTimothy Pearson <[email protected]>2012-02-26 14:21:44 -0600
commit16008b91eebc7152508e74ea5ab44a7cf521a682 (patch)
tree7d65d87e770bb5de629cf0dd1019118ba18de732
parentd74793dab24a4c74113c8440ff57460c84249bb6 (diff)
downloadkrusader-16008b91eebc7152508e74ea5ab44a7cf521a682.tar.gz
krusader-16008b91eebc7152508e74ea5ab44a7cf521a682.zip
Rename kde-config to tde-config
-rw-r--r--INSTALL4
-rw-r--r--acinclude.m410
-rw-r--r--configure.in2
-rw-r--r--doc/en/installation.docbook4
-rw-r--r--doc/en/useractions.docbook4
-rw-r--r--doc/ru/installation.docbook4
-rw-r--r--doc/ru/krusader-tools.docbook4
7 files changed, 16 insertions, 16 deletions
diff --git a/INSTALL b/INSTALL
index 9b4ad9c..225d042 100644
--- a/INSTALL
+++ b/INSTALL
@@ -377,7 +377,7 @@ the FAQ. If the problem persists, use the help_request to ask for help.
Assuming Krusader is not the only Qt&#8482;/KDE program you want to
compile, we recommend to make these settings permanent (e.g. append both
export commands to your /etc/profile) file.
- If you can notdetermine your TDEDIR, kde-config --prefix might help you.
+ If you can notdetermine your TDEDIR, tde-config --prefix might help you.
8. If you have downloaded a stable version "krusader-x.xx.tar.gz" or a beta
version "krusader-x.xx-betax.tar.gz", you can skip this step. In this
case the ./configure script is provided.
@@ -465,7 +465,7 @@ the FAQ. If the problem persists, use the help_request to ask for help.
Krusader sources.
If you used another --prefix= than $TDEDIR or /usr/local, it is
recommended to do an extra check:
- $ kde-config --path exe
+ $ tde-config --path exe
/home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/
$
If the <prefix_dir/bin> directory is not shown, you need to use e.g.
diff --git a/acinclude.m4 b/acinclude.m4
index 7fa72e3..99d8547 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4981,13 +4981,13 @@ AC_DEFUN([KDE_SET_PREFIX],
KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
- dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
+ KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else
- dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+ dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH"
fi
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by kde-config)])
+ AC_MSG_RESULT([$prefix (as returned by tde-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
diff --git a/configure.in b/configure.in
index a55d204..5bb53f8 100644
--- a/configure.in
+++ b/configure.in
@@ -235,7 +235,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet
- echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+ echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then
echo ""
echo "Warning: you chose to install this package in $given_prefix,"
diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook
index 478e8d9..30e97f7 100644
--- a/doc/en/installation.docbook
+++ b/doc/en/installation.docbook
@@ -655,7 +655,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won'
file.</para>
</note>
<para>If you can notdetermine your TDEDIR,
- <command>kde-config --prefix</command> might help
+ <command>tde-config --prefix</command> might help
you.</para>
<para></para>
<!-- Empty line to make it more readable -->
@@ -817,7 +817,7 @@ Good - your configure finished. Start make now
<para>If you used another --prefix= than
<filename>$TDEDIR or /usr/local</filename>, it is
recommended to do an extra check:
-<screen><prompt>$</prompt> <userinput><command>kde-config</command> <option>--path exe</option></userinput>
+<screen><prompt>$</prompt> <userinput><command>tde-config</command> <option>--path exe</option></userinput>
/home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/
<prompt>$</prompt></screen>
If the
diff --git a/doc/en/useractions.docbook b/doc/en/useractions.docbook
index 2c3b5fd..72e5129 100644
--- a/doc/en/useractions.docbook
+++ b/doc/en/useractions.docbook
@@ -550,9 +550,9 @@
<filename>
&lt;kde-app-data&gt;/krusader/js/</filename>.
&lt;kde-app-data&gt; is
- <filename>$(kde-config
+ <filename>$(tde-config
--localprefix)/share/apps/</filename> or
- <filename>$(kde-config --prefix)/share/apps/</filename>,
+ <filename>$(tde-config --prefix)/share/apps/</filename>,
for those who don't know where to copy the
scripts/extensions. If all the needed files (normally
<filename>.js</filename> and maybe
diff --git a/doc/ru/installation.docbook b/doc/ru/installation.docbook
index 064dc04..b9c88a0 100644
--- a/doc/ru/installation.docbook
+++ b/doc/ru/installation.docbook
@@ -565,7 +565,7 @@
<para
>If you can't determine your TDEDIR than <command
->kde-config --prefix</command
+>tde-config --prefix</command
> might help you.</para>
<!-- Empty line to make it more readable -->
@@ -739,7 +739,7 @@ Good - your configure finished. Start make now
>If you dit use the an other --prefix= than <filename
>$TDEDIR or /usr/local</filename
> , then it can't hurt to do an extra check: <screen
-><prompt>$</prompt> <userinput><command>kde-config</command> <option>--path exe</option></userinput>
+><prompt>$</prompt> <userinput><command>tde-config</command> <option>--path exe</option></userinput>
/home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/
<prompt>$</prompt></screen
> If the &lt;prefix_dir/bin&gt; directory is not shown, you need to use e.g. <command
diff --git a/doc/ru/krusader-tools.docbook b/doc/ru/krusader-tools.docbook
index dcd7f02..d0b5abc 100644
--- a/doc/ru/krusader-tools.docbook
+++ b/doc/ru/krusader-tools.docbook
@@ -3901,9 +3901,9 @@
>&useraction_parameter; path to the external foo.js file, absolut path or relative to <filename
>&lt;kde-app-data&gt;/krusader/js/</filename
>. &lt;kde-app-data&gt; is <filename
->$(kde-config --localprefix)/share/apps/</filename
+>$(tde-config --localprefix)/share/apps/</filename
> or <filename
->$(kde-config --prefix)/share/apps/</filename
+>$(tde-config --prefix)/share/apps/</filename
>, for those who don't know where so copy the scripts/extensions. If all the needed files (normaly <filename
>.js</filename
> and maybe <filename