summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-26 14:14:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-26 14:14:45 -0600
commit6a565761abf42169a9cf63d28e7274158cf94979 (patch)
treead1b99e95863effa80b2d39d07d46ec70d1e4d30
parentd6ef9b724791e02c050e9cbe1d29cbae531603ca (diff)
downloadbibletime-6a565761abf42169a9cf63d28e7274158cf94979.tar.gz
bibletime-6a565761abf42169a9cf63d28e7274158cf94979.zip
Rename kde-config to tde-config
-rw-r--r--INSTALL2
-rw-r--r--INSTALL.in2
-rw-r--r--acinclude.m410
-rw-r--r--pot/Makefile.am4
4 files changed, 9 insertions, 9 deletions
diff --git a/INSTALL b/INSTALL
index abd98bc..6af5cc8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ Compile BibleTime 1.6.5.1:
cd ~
tar -xjf bibletime-1.6.5.1.tar.bz2
cd ~/bibletime-1.6.5.1 # Move to your source directory
-kde-config --prefix # Displays your KDE directory (optional)
+tde-config --prefix # Displays your KDE directory (optional)
./configure --prefix=<your KDE dir> # create makefiles
make # compile BibleTime
su -c "make install" # change to "root user" and install BibleTime
diff --git a/INSTALL.in b/INSTALL.in
index ab58c09..59b0276 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -31,7 +31,7 @@ Compile BibleTime @VERSION@:
cd ~
tar -xjf bibletime-@VERSION@.tar.bz2
cd ~/bibletime-@VERSION@ # Move to your source directory
-kde-config --prefix # Displays your KDE directory (optional)
+tde-config --prefix # Displays your KDE directory (optional)
./configure --prefix=<your KDE dir> # create makefiles
make # compile BibleTime
su -c "make install" # change to "root user" and install BibleTime
diff --git a/acinclude.m4 b/acinclude.m4
index 95dd68e..a443a5a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4763,13 +4763,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
@@ -4786,7 +4786,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/pot/Makefile.am b/pot/Makefile.am
index 585b1fa..7a4c458 100644
--- a/pot/Makefile.am
+++ b/pot/Makefile.am
@@ -19,10 +19,10 @@ messages:
echo Now extract the messages...
perl ./extractrc ../bibletime/xml/*.rc > ../bibletime/rc-dummy.cpp
perl ./preparetips ../docs/tips > ../bibletime/tips-dummy.cpp
- $(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/tde/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot
+ $(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `tde-config --prefix`/include/tde/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot
recode iso8859-1..utf-8 messages.pot
cp ../bibletime/backend/clanguagemgr.cpp clanguagemgr.cpp
- $(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/tde/kde.pot clanguagemgr.cpp -o messages.pot
+ $(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `tde-config --prefix`/include/tde/kde.pot clanguagemgr.cpp -o messages.pot
rm clanguagemgr.cpp
echo Finished creating messages.pot.