discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9f36dc1b439776dce1ff2a2a3830574e71dc8061
commit 9f36dc1b439776dce1ff2a2a3830574e71dc8061
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Thu Jan 29 12:43:14 2015 -0500
Revert "Include /usr/local too in the no-duplication of XDG_DATA_DIRS"
This reverts commit ae3410a0bad31c1850e845eab284540aadb8c65b.
---
src/bin/e_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index d2742f8..27eabb7 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -127,8 +127,8 @@ _xdg_data_dirs_augment(void)
s = getenv("XDG_DATA_DIRS");
- // don't add e_prefix path if it is already /usr or /usr/local
- if ((strcmp(p, "/usr") == 0) || (strcmp(p, "/usr/local") == 0))
+ // if our prefix is already /usr we should not append /usr/share here yet
+ if (strcmp(p, "/usr") == 0)
snprintf(newpath, sizeof(newpath), "%s", e_prefix_data_get());
else
snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
--
