From 35644202a4add89feed2d7d12eacca433ac4972b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 18:53:34 -0600 Subject: [PATCH] Rename KDEHOME and KDEDIR --- acinclude.m4 | 26 +++++++++++++------------- configure.in | 4 ++-- doc/en/configuration.docbook | 2 +- doc/en/faqs.docbook | 22 +++++++++++----------- doc/en/fundamentals.docbook | 4 ++-- doc/en/hacking.docbook | 2 +- doc/fr/configuration.docbook | 2 +- doc/fr/faqs.docbook | 22 +++++++++++----------- doc/fr/fundamentals.docbook | 4 ++-- doc/fr/hacking.docbook | 2 +- xslt/tellico-printing.xsl | 2 +- xslt/tellico2html.xsl | 2 +- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1e1fa29..4c98bf0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -388,13 +388,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) @@ -557,11 +557,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 @@ -623,7 +623,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/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="" @@ -1798,7 +1798,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" @@ -1810,7 +1810,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" @@ -3555,7 +3555,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 @@ -4952,12 +4952,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 @@ -4981,7 +4981,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 80c5188..8b6a1bf 100644 --- a/configure.in +++ b/configure.in @@ -702,8 +702,8 @@ 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," - echo "by ensuring that KDEDIRS contains it, e.g." - echo " export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "by ensuring that TDEDIRS contains it, e.g." + echo " export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/doc/en/configuration.docbook b/doc/en/configuration.docbook index 3b7a617..652bb7a 100644 --- a/doc/en/configuration.docbook +++ b/doc/en/configuration.docbook @@ -135,7 +135,7 @@ will honor those settings. However, custom template may choose to ignore them.kde-files.org by clicking the Download button. Any templates installed by the user may also be deleted. -Entry templates are saved in $KDEHOME/share/apps/tellico/entry-templates/. +Entry templates are saved in $TDEHOME/share/apps/tellico/entry-templates/. If you create a new template, please consider submitting it at kde-files.org! diff --git a/doc/en/faqs.docbook b/doc/en/faqs.docbook index c07ff12..1b1b296 100644 --- a/doc/en/faqs.docbook +++ b/doc/en/faqs.docbook @@ -63,8 +63,8 @@ separating each value. Yes, most certainly. Find the file tellico-printing.xsl which - should be in the $KDEDIR/share/apps/tellico/ directory. You can copy - that to $KDEHOME/share/apps/tellico/ for personal modifications. + should be in the $TDEDIR/share/apps/tellico/ directory. You can copy + that to $TDEHOME/share/apps/tellico/ for personal modifications. You'll have to know &xslt;, but modifying that file is how you change the printing layout. &html; is generated from the @@ -73,7 +73,7 @@ separating each value. url="&homepage;">the &appname; website. Be aware that the tellico-printing.xsl references another file, tellico-common.xsl, that contains some common &xslt; templates. If you copy -tellico-printing.xsl to $KDEHOME, you must either modify the <xsl:import> element to point to the actual location of the tellico-common.xsl file or copy the common file as well. +tellico-printing.xsl to $TDEHOME, you must either modify the <xsl:import> element to point to the actual location of the tellico-common.xsl file or copy the common file as well. @@ -153,15 +153,15 @@ the toolbar. Entry templates should be saved in -$KDEHOME/share/apps/tellico/entry-templates/ +$TDEHOME/share/apps/tellico/entry-templates/ for access for a single user or -$KDEDIR/share/apps/tellico/entry-templates/ -for access by everyone. Templates in $KDEHOME will -override any files by the same name in $KDEDIRS. The +$TDEDIR/share/apps/tellico/entry-templates/ +for access by everyone. Templates in $TDEHOME will +override any files by the same name in $TDEDIRS. The entry templates can be set on a per collection-type basis in the settings dialog. -Templates for the &report-dialog; are saved in $KDEHOME/share/apps/tellico/report-templates/. +Templates for the &report-dialog; are saved in $TDEHOME/share/apps/tellico/report-templates/. @@ -173,14 +173,14 @@ wrong? KDE programs look for data in the locations defined in the - $KDEDIRS environmental variable. If you install in + $TDEDIRS environmental variable. If you install in /usr/local for example, but - $KDEDIRS is empty or just /usr, + $TDEDIRS is empty or just /usr, then &appname; won't be able to find the files it needs. This is particularly true for SuSE, for which you should compile with =/opt/trinity. Alternatively, you could add a line to your .profile file to - set $KDEDIRS. Check the documentation for your + set $TDEDIRS. Check the documentation for your shell. diff --git a/doc/en/fundamentals.docbook b/doc/en/fundamentals.docbook index 046a651..ee9ec98 100644 --- a/doc/en/fundamentals.docbook +++ b/doc/en/fundamentals.docbook @@ -184,7 +184,7 @@ The edit widget also supports drag-and-drop. Dragging an image file from a file- -By default, the images are stored in the collection data file, keeping everything contained in one location. However, too many images will cause &appname; to slow down significantly as well result in a very large data file. Alternatively, &appname; can save the images separately, either in the $KDEHOME/share/apps/tellico/data/ directory or in a directory in the same location as the data file. Loading and saving data files is much faster if images are stored separately, but the data files are no longer portable or archivable. +By default, the images are stored in the collection data file, keeping everything contained in one location. However, too many images will cause &appname; to slow down significantly as well result in a very large data file. Alternatively, &appname; can save the images separately, either in the $TDEHOME/share/apps/tellico/data/ directory or in a directory in the same location as the data file. Loading and saving data files is much faster if images are stored separately, but the data files are no longer portable or archivable. Self-contained data files can always be created by using the FileExportExport to Zip... menu item. @@ -440,7 +440,7 @@ button, set the first rule to Author contains Bujold and th Generating Reports -&appname; can generate various reports about your current collection. The &report-dialog; checks for all &xslt; templates in the installation path and in $KDEHOME/share/apps/tellico/report-templates/. So you can create new ones, and they're automatically found and included as options in the &report-dialog;. Some complex reports may take a while to generate for large collections. +&appname; can generate various reports about your current collection. The &report-dialog; checks for all &xslt; templates in the installation path and in $TDEHOME/share/apps/tellico/report-templates/. So you can create new ones, and they're automatically found and included as options in the &report-dialog;. Some complex reports may take a while to generate for large collections. diff --git a/doc/en/hacking.docbook b/doc/en/hacking.docbook index 89d1c54..39a3df0 100644 --- a/doc/en/hacking.docbook +++ b/doc/en/hacking.docbook @@ -258,7 +258,7 @@ The format of the field is given in the format attribute on the field element. < -The settings for &appname; are saved in a file in the user's home folder, namely $KDEHOME/share/config/tellicorc. Within that file, settings are put in groups, which appear with bracketed names, such as [General Options]. To add a setting to the General Options group, find the line in the settings file with that group name. If it does not appear, then create it yourself by adding a line saying [General Options]. Then, the setting can be added underneath the group name. +The settings for &appname; are saved in a file in the user's home folder, namely $TDEHOME/share/config/tellicorc. Within that file, settings are put in groups, which appear with bracketed names, such as [General Options]. To add a setting to the General Options group, find the line in the settings file with that group name. If it does not appear, then create it yourself by adding a line saying [General Options]. Then, the setting can be added underneath the group name. diff --git a/doc/fr/configuration.docbook b/doc/fr/configuration.docbook index dc65eb6..40922b8 100644 --- a/doc/fr/configuration.docbook +++ b/doc/fr/configuration.docbook @@ -149,7 +149,7 @@ chaque type de collection. Certains modèles, tels que ceux définis pour les Les modèles additionnels peuvent être installés dans -$KDEHOME/share/apps/tellico/entry-templates/. +$TDEHOME/share/apps/tellico/entry-templates/. diff --git a/doc/fr/faqs.docbook b/doc/fr/faqs.docbook index 9239f76..34e8e63 100644 --- a/doc/fr/faqs.docbook +++ b/doc/fr/faqs.docbook @@ -66,8 +66,8 @@ entre chaque valeur. Oui, bien sûr. Trouvez le fichier tellico-printing.xsl qui devrait se trouver dans le -repertoire $KDEDIR/share/apps/tellico/. Vous pouvez le copier -dans $KDEHOME/share/apps/tellico/ pour y apporter des +repertoire $TDEDIR/share/apps/tellico/. Vous pouvez le copier +dans $TDEHOME/share/apps/tellico/ pour y apporter des modifications personnelles. Il est nécessaire de connaître le langage &xslt;, mais modifier ce fichier est la seule façon de changer la mise en forme. Les données &html; sont @@ -81,7 +81,7 @@ d'impression alternatifs &xslt; seront disponibles sur tellico-printing.xsl fait référence à un autre, tellico-common.xsl, qui contient certaines structures &xslt; génériques. Si vous copiez tellico-printing.xsl -dans $KDEHOME, vous devrez soit modifier l'élément +dans $TDEHOME, vous devrez soit modifier l'élément <xsl:import> pour pointer vers la position du fichier tellico-common.xsl ou copier le fichier commun avec. @@ -165,16 +165,16 @@ filtrer vos livres pour afficher ceux de Weber ou Bujold, tapez "weber|bujold" Les modèles d'entrées devraient être savés dans -$KDEHOME/share/apps/tellico/entry-templates/ +$TDEHOME/share/apps/tellico/entry-templates/ pour un utilisateur simple, ou dans -$KDEDIR/share/apps/tellico/entry-templates/ -pour qu'ils soient accessibles à tous. Les modèles dans $KDEHOME -sont prioritaires sur les fichiers portant le même nom dans $KDEDIRS. +$TDEDIR/share/apps/tellico/entry-templates/ +pour qu'ils soient accessibles à tous. Les modèles dans $TDEHOME +sont prioritaires sur les fichiers portant le même nom dans $TDEDIRS. Les modèles d'entrées peuvent être configurés par type de collection dans la boite de dialogue de configuration. Les modèles pour la &report-dialog; sont enregistrés dans -$KDEHOME/share/apps/tellico/report-templates/. +$TDEHOME/share/apps/tellico/report-templates/. @@ -186,14 +186,14 @@ ne va pas ? Les logiciels KDE cherchent les données à l'endroit défini par la variable - d'environnement $KDEDIRS. Si vous installez dans + d'environnement $TDEDIRS. Si vous installez dans /usr/local par exemple, mais que - $KDEDIRS est vide ou seulement /usr, + $TDEDIRS est vide ou seulement /usr, alors &appname; ne pourra pas trouver les fichiers dont il a besoin. Ceci est particulièrement vrai pour SuSE, pour lequel vous devriez compiler avec =/opt/trinity. Alternativement, vous pouvez ajouter une ligne à votre fichier .profile pour - configurer $KDEDIRS. Veuillez consulter la documentation + configurer $TDEDIRS. Veuillez consulter la documentation de votre shell pour plus de détails. diff --git a/doc/fr/fundamentals.docbook b/doc/fr/fundamentals.docbook index 7750615..91c8f78 100644 --- a/doc/fr/fundamentals.docbook +++ b/doc/fr/fundamentals.docbook @@ -300,7 +300,7 @@ collection, conservant ainsi toutes les données au même endroit. Cependant, un trop grand nombre d'images ralentira &appname; et générera des fichiers de taille importante. Cependant, &appname; peut également enregistrer les images séparément, soit dans le répertoire -$KDEHOME/share/apps/tellico/data/, +$TDEHOME/share/apps/tellico/data/, soit dans un répertoire au même endroit que le fichier de données Tellico. Dans ce cas, le chargement et l'enregistrement des fichiers de données est nettement plus rapide ; mais les fichiers de données ne peuvent alors plus être @@ -642,7 +642,7 @@ Pour trouver les livres écrits par Bujold et Weber, validez le bouton &appname; peut générer divers rapports concernant votre collection. La &report-dialog; vérifie les modèles &xslt; dans le répertoire d'installation ainsi que dans -$KDEHOME/share/apps/tellico/report-templates/. +$TDEHOME/share/apps/tellico/report-templates/. Vous pouvez ainsi en créer de nouveaux, qui seront automatiquement inclus sous forme d'options dans la &report-dialog;. Certains rapports complexes peuvent nécessiter un certain temps pour leur génération. diff --git a/doc/fr/hacking.docbook b/doc/fr/hacking.docbook index ed30c0a..47dec5e 100644 --- a/doc/fr/hacking.docbook +++ b/doc/fr/hacking.docbook @@ -327,7 +327,7 @@ la boite de dialogue avec plus d'options, mais puisqu'elles peuvent être utiles Les paramètres de &appname; sont enregistrés dans un fichier du répertoire de l'utilisateur, -$KDEHOME/share/config/tellicorc. +$TDEHOME/share/config/tellicorc. Dans ce fichier; les paramètres sont rassemblés dans des groupes qui apparaissent avec un nom entre crochet, tel que [General Options]. Pour ajouter un paramètre au groupe General Options, diff --git a/xslt/tellico-printing.xsl b/xslt/tellico-printing.xsl index bbc8ee4..9d997fd 100644 --- a/xslt/tellico-printing.xsl +++ b/xslt/tellico-printing.xsl @@ -29,7 +29,7 @@ elements to speed up grouped printing. Any version of this file in the user's home directory, such as - $KDEHOME/share/apps/tellico/, will override the system file. + $TDEHOME/share/apps/tellico/, will override the system file. =================================================================== --> diff --git a/xslt/tellico2html.xsl b/xslt/tellico2html.xsl index ae23984..b87ef75 100644 --- a/xslt/tellico2html.xsl +++ b/xslt/tellico2html.xsl @@ -33,7 +33,7 @@ Customize this file in order to print different columns of fields for each entry. Any version of this file in the user's - KDE home directory, such as $KDEHOME/share/apps/tellico/, will + KDE home directory, such as $TDEHOME/share/apps/tellico/, will override the system file. =================================================================== -->