From 49bd3905651942e5b353af810dbebb2079955c60 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 21 Jul 2006 15:55:54 +0000 Subject: [PATCH] some prefix fixes for env vars SVN revision: 24104 --- legacy/edje/src/bin/edje_prefix.c | 26 ++++++++++-------------- legacy/embryo/src/bin/embryo_cc_prefix.c | 26 ++++++++++-------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/legacy/edje/src/bin/edje_prefix.c b/legacy/edje/src/bin/edje_prefix.c index 00d990d513..758f274061 100644 --- a/legacy/edje/src/bin/edje_prefix.c +++ b/legacy/edje/src/bin/edje_prefix.c @@ -58,26 +58,22 @@ e_prefix_determine(char *argv0) { _prefix_path = strdup(getenv("E_PREFIX")); if (getenv("E_BIN_DIR")) - _prefix_path_bin = strdup(getenv("E_BIN_DIR")); + snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); - _prefix_path_bin = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); + _prefix_path_bin = strdup(buf); + if (getenv("E_LIB_DIR")) - _prefix_path_bin = strdup(getenv("E_LIB_DIR")); + snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); - _prefix_path_lib = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); + _prefix_path_lib = strdup(buf); + if (getenv("E_DATA_DIR")) - _prefix_path_data = strdup(getenv("E_DATA_DIR")); + snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); - _prefix_path_data = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); + _prefix_path_data = strdup(buf); return 1; } /* no env var - examine process and possible argv0 */ diff --git a/legacy/embryo/src/bin/embryo_cc_prefix.c b/legacy/embryo/src/bin/embryo_cc_prefix.c index 17557b2b42..db9caaf2e2 100644 --- a/legacy/embryo/src/bin/embryo_cc_prefix.c +++ b/legacy/embryo/src/bin/embryo_cc_prefix.c @@ -58,26 +58,22 @@ e_prefix_determine(char *argv0) { _prefix_path = strdup(getenv("E_PREFIX")); if (getenv("E_BIN_DIR")) - _prefix_path_bin = strdup(getenv("E_BIN_DIR")); + snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); - _prefix_path_bin = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); + _prefix_path_bin = strdup(buf); + if (getenv("E_LIB_DIR")) - _prefix_path_bin = strdup(getenv("E_LIB_DIR")); + snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); - _prefix_path_lib = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); + _prefix_path_lib = strdup(buf); + if (getenv("E_DATA_DIR")) - _prefix_path_data = strdup(getenv("E_DATA_DIR")); + snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR")); else - { - snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); - _prefix_path_data = strdup(buf); - } + snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); + _prefix_path_data = strdup(buf); return 1; } /* no env var - examine process and possible argv0 */