Updating branch refs/heads/master
to 424cf44d5616a06d9f5be35b171a0de222518ce4 (commit)
from 4355082db4500c0c326bc456c9a366dbbf816f37 (commit)
commit 424cf44d5616a06d9f5be35b171a0de222518ce4
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Mon May 31 21:03:22 2010 +0200
Avoid /usr/local/share being added to XDG_DATA_DIRS more than once.
scripts/startxfce4.in | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
index c9b4e67..f4a11d4 100644
--- a/scripts/startxfce4.in
+++ b/scripts/startxfce4.in
@@ -28,9 +28,13 @@ fi
if test "x$XDG_DATA_DIRS" = "x"
then
- XDG_DATA_DIRS="/usr/local/share:/usr/share:@_datadir_@"
+ if test "x...@_datadir_@" = "x/usr/local/share"; then
+ XDG_DATA_DIRS="/usr/local/share:/usr/share"
+ else
+ XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
+ fi
else
- XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
+ XDG_DATA_DIRS="@_datadir_@:$XDG_DATA_DIRS"
fi
export XDG_DATA_DIRS
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
