thanatermesis pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=60b003245bed7d674cb2d53707fa71d4fbb55924
commit 60b003245bed7d674cb2d53707fa71d4fbb55924
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Thu Jan 29 12:43:20 2015 -0500
Revert "Do not add /usr/share twice for XDG_DATA_DIRS"
This reverts commit e3eda1d690240e3754432ebba540114479e721ed.
hardcoding directory paths is not a solution that I want to see used for
this issue.
(cherry picked from commit fbde0824d1960f890550d816ac9d21c0459ff984)
Signed-off-by: Thanatermesis <thanaterme...@gmail.com>
---
src/bin/e_main.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index dffc386..cec4e22 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -139,13 +139,7 @@ _xdg_data_dirs_augment(void)
if (!p) return;
s = getenv("XDG_DATA_DIRS");
-
- // 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);
-
+ snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
if (s)
{
if (strncmp(s, newpath, strlen(newpath)))
--
