Revert "Include /usr/local too in the no-duplication of XDG_DATA_DIRS"

This reverts commit ae3410a0ba.
(cherry picked from commit 9f36dc1b43)

Signed-off-by: Thanatermesis <thanatermesis@gmail.com>
This commit is contained in:
Mike Blumenkrantz 2015-01-29 12:43:14 -05:00 committed by Thanatermesis
parent 87606ecb4b
commit 58da664ccf
1 changed files with 2 additions and 2 deletions

View File

@ -140,8 +140,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);