From ae3410a0bad31c1850e845eab284540aadb8c65b Mon Sep 17 00:00:00 2001 From: Thanatermesis Date: Wed, 31 Dec 2014 19:12:36 +0100 Subject: [PATCH] Include /usr/local too in the no-duplication of XDG_DATA_DIRS @fix and improves the previous fix (cherry picked from commit e0dcab584bba0d62b21bafdbbeefae78ccccf3cb) Signed-off-by: Deon Thomas --- 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 27eabb7bb..d2742f818 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"); - // if our prefix is already /usr we should not append /usr/share here yet - if (strcmp(p, "/usr") == 0) + // don't add e_prefix path if it is already /usr or /usr/local + if ((strcmp(p, "/usr") == 0) || (strcmp(p, "/usr/local") == 0)) snprintf(newpath, sizeof(newpath), "%s", e_prefix_data_get()); else snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);