shared: remove weston_config_get_libexec_dir()

Now that WESTON_MODULE_MAP supersedes WESTON_BUILD_DIR for libexec
binaries, we don't need to check in WESTON_BUILD_DIR anymore.

There was only one user of weston_config_get_libexec_dir(), so remove
the whole function. There is no reason to export it.

Due to libshared.la being pulled into libweston, this probably was
libweston ABI unintended. Regardless, libweston major has already been
bumped.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Pekka Paalanen 2018-06-14 16:20:32 +03:00
parent e03c111e4e
commit c5aaaa7b39
3 changed files with 1 additions and 16 deletions

View File

@ -738,8 +738,7 @@ wet_get_binary_path(const char *name)
if (len > 0)
return strdup(path);
len = snprintf(path, sizeof path, "%s/%s",
weston_config_get_libexec_dir(), name);
len = snprintf(path, sizeof path, "%s/%s", LIBEXECDIR, name);
if (len >= sizeof path)
return NULL;

View File

@ -330,18 +330,6 @@ weston_config_section_get_bool(struct weston_config_section *section,
return 0;
}
WL_EXPORT
const char *
weston_config_get_libexec_dir(void)
{
const char *path = getenv("WESTON_BUILD_DIR");
if (path)
return path;
return LIBEXECDIR;
}
const char *
weston_config_get_name_from_env(void)
{

View File

@ -103,8 +103,6 @@ int
weston_config_section_get_bool(struct weston_config_section *section,
const char *key,
int *value, int default_value);
const char *
weston_config_get_libexec_dir(void);
const char *
weston_config_get_name_from_env(void);