diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | bibletime/Makefile.am | 2 | ||||
| -rw-r--r-- | bibletime/util/ctoolclass.h | 2 | ||||
| -rw-r--r-- | docs/handbook/unicode/hdbk-start.docbook | 2 | ||||
| -rw-r--r-- | pot/handbook.pot | 2 |
6 files changed, 18 insertions, 18 deletions
@@ -351,7 +351,7 @@ * Bugfix: Bookmark drag&drop should work now 2005-08-01 Joachim Ansorg <[email protected]> - * New feature: Display templates can now be stored in $KDEDIR/share/apps/bibletime/display-templates/ and + * New feature: Display templates can now be stored in $TDEDIR/share/apps/bibletime/display-templates/ and $HOME/.kde/share/apps/bibletime/display-templates/ 2005-07-16 Joachim Ansorg <[email protected]> diff --git a/acinclude.m4 b/acinclude.m4 index de13898..d091ca8 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 @@ -608,7 +608,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" && test ! "$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="" @@ -1795,7 +1795,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" @@ -1807,7 +1807,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" @@ -3331,7 +3331,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 @@ -4730,12 +4730,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 @@ -4759,7 +4759,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/bibletime/Makefile.am b/bibletime/Makefile.am index 7c2e7bd..ac6795c 100644 --- a/bibletime/Makefile.am +++ b/bibletime/Makefile.am @@ -62,7 +62,7 @@ DISTCLEANFILES = $(bibletime_METASOURCES) # make messages.po. Move this one to ../po/ and "make merge" in po # the -x is for skipping messages already translated in tdelibs #messages: -# $(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot +# $(XGETTEXT) -C -ki18n -x $(TDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_confdir) diff --git a/bibletime/util/ctoolclass.h b/bibletime/util/ctoolclass.h index f87c5e4..6f09484 100644 --- a/bibletime/util/ctoolclass.h +++ b/bibletime/util/ctoolclass.h @@ -34,7 +34,7 @@ class TQLabel; class CToolClass { public: /** - * @return The path of the HTML file "filename". This function searches only in $KDEDIR. + * @return The path of the HTML file "filename". This function searches only in $TDEDIR. * @author Sandy Meier of the KDevelop team. */ static TQString locatehtml(const TQString &filename); diff --git a/docs/handbook/unicode/hdbk-start.docbook b/docs/handbook/unicode/hdbk-start.docbook index 0630959..525fb07 100644 --- a/docs/handbook/unicode/hdbk-start.docbook +++ b/docs/handbook/unicode/hdbk-start.docbook @@ -30,7 +30,7 @@ bibletime in /opt/kde, then the start-up command in a terminal would be:</para> <screen> -export KDEDIR=/opt/kde #your KDE directory +export TDEDIR=/opt/kde #your KDE directory bibletime </screen> diff --git a/pot/handbook.pot b/pot/handbook.pot index ac4acc7..828faf5 100644 --- a/pot/handbook.pot +++ b/pot/handbook.pot @@ -2328,7 +2328,7 @@ msgstr "" #: hdbk-start.docbook:30 #, no-c-format msgid "" -"export KDEDIR=/opt/kde #your KDE directory\n" +"export TDEDIR=/opt/kde #your KDE directory\n" "bibletime" msgstr "" |