$OpenBSD: patch-scripts_xdg-settings,v 1.1 2012/04/09 09:39:15 ajacoutot Exp $ --- scripts/xdg-settings.orig Mon Apr 9 11:13:21 2012 +++ scripts/xdg-settings Mon Apr 9 11:14:22 2012 @@ -364,7 +364,7 @@ first_word() binary_to_desktop_file() { - search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" + search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}" binary="`which "$1"`" binary="`readlink -f "$binary"`" base="`basename "$binary"`" @@ -392,7 +392,7 @@ binary_to_desktop_file() desktop_file_to_binary() { - search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" + search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}" desktop="`basename "$1"`" IFS=: for dir in $search; do @@ -655,7 +655,7 @@ set_browser_gnome() get_browser_xfce() { - search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-/etc/xdg}" + search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-${SYSCONFDIR}/xdg}" IFS=: for dir in $search; do unset IFS @@ -688,7 +688,7 @@ check_xfce_desktop_file() # "Type" must be "X-XFCE-Helper" # "X-XFCE-Category" must be "WebBrowser" (for web browsers, anyway) # "X-XFCE-Commands" and "X-XFCE-CommandsWithParameter" must be set - search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" + search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}" IFS=: for dir in $search; do unset IFS