From 807b6093f7f1669a1c6cd5fc4aac032be7c43cb7 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 9 Oct 2005 17:39:52 +0000
Subject: [PATCH] Updated the XDG environment variables in the
 desktop-file-utils instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5155 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genutils/desktop-file-utils.xml | 35 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/general/genutils/desktop-file-utils.xml b/general/genutils/desktop-file-utils.xml
index 9779986dec..f7b812d3f7 100644
--- a/general/genutils/desktop-file-utils.xml
+++ b/general/genutils/desktop-file-utils.xml
@@ -91,25 +91,32 @@ make</userinput></screen>
     <sect3>
       <title>Configuration Information</title>
 
-      <para>The default location for the MIME-types application
-      database is <filename>/usr/share/applications/mimeinfo.cache</filename>. If
-      you are going to install, or have already installed, a desktop environment
-      such as <application>GNOME</application> or
-      <application>KDE</application> in a prefix other than
-      <filename class='directory'>/usr</filename>, you'll need to update the
-      <envar>XDG_DATA_DIRS</envar> environment variable so that additional
-      MIME-types application databases are properly maintained.
-      Add the following to the system-wide or personal profile:</para>
+      <para>The default location for the MIME-types application database is
+      <filename>/usr/share/applications/mimeinfo.cache</filename>. If you are
+      going to install, or have already installed, a desktop environment such
+      as <application>GNOME</application> or <application>KDE</application> in
+      a prefix other than <filename class='directory'>/usr</filename>, you'll
+      need to update the <envar>XDG_DATA_DIRS</envar> and
+      <envar>XDG_CONFIG_DIRS</envar> environment variables so that the
+      additional MIME-types application databases and desktop menu files are
+      properly maintained and discovered. Add the following to the system-wide
+      or personal profile:</para>
 
       <para>For <application>GNOME</application>:</para>
 
-<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share
-export XDG_DATA_DIRS</literal></screen>
+<screen><literal>XDG_DATA_DIRS=/usr/share:$GNOME_PREFIX/share
+XDG_CONFIG_DIRS=/usr/share:/etc/gnome/xdg
+export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
 
       <para>For <application>KDE</application>:</para>
 
-<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDE_PREFIX/share
-export XDG_DATA_DIRS</literal></screen>
+<screen><literal>XDG_DATA_DIRS=/usr/share:$KDE_PREFIX/share
+XDG_CONFIG_DIRS=/usr/share:/etc/kde/xdg
+export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
+
+
+<!-- This ends up messing up the menus and the GNOME and KDE stuff is simply
+     not yet interchangeable
 
       <para>If you're installing both <application>GNOME</application> and
       <application>KDE</application>:</para>
@@ -117,6 +124,8 @@ export XDG_DATA_DIRS</literal></screen>
 <screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:$KDE_PREFIX/share
 export XDG_DATA_DIRS</literal></screen>
 
+-->
+
     </sect3>
 
   </sect2>