X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-path%2Fsd-path.c;h=360c85405be8c4033293178fc299f95d7b64380d;hb=0c7448867271180e8ac5795ebdff4bee0c0acd0c;hp=44c1b8bd70fa0f9a94b22e6fb40b74256e5d1bee;hpb=9a00f57a5ba7ed431e6bac8d8b36518708503b4e;p=elogind.git diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index 44c1b8bd7..360c85405 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -22,6 +22,7 @@ #include "path-util.h" #include "strv.h" #include "sd-path.h" +#include "missing.h" static int from_environment(const char *envname, const char *fallback, const char **ret) { assert(ret); @@ -275,7 +276,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return from_home_dir(NULL, ".local/lib", buffer, ret); case SD_PATH_USER_LIBRARY_ARCH: - return from_home_dir(NULL, ".local/lib/" ARCH_TUPLE, buffer, ret); + return from_home_dir(NULL, ".local/lib/" LIB_ARCH_TUPLE, buffer, ret); case SD_PATH_USER_SHARED: return from_home_dir("XDG_DATA_HOME", ".local/share", buffer, ret); @@ -502,7 +503,7 @@ static int get_search(uint64_t type, char ***list) { case SD_PATH_SEARCH_LIBRARY_ARCH: return search_from_environment(list, NULL, - ".local/lib/" ARCH_TUPLE, + ".local/lib/" LIB_ARCH_TUPLE, "LD_LIBRARY_PATH", true, LIBDIR,