From cfb66ee856ebcd4d50405b0f5b5b8881d09cb582 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 27 Dec 2005 17:37:48 +0000 Subject: [PATCH] (set_env_dir): New function. (set_relocation): Use it to fix setting PANGO_PREFIX. --- ChangeLog | 5 +++++ lily/relocate.cc | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7b96aa657b..affb81ba29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-27 Jan Nieuwenhuizen + + * lily/relocate.cc (set_env_dir): New function. + (set_relocation): Use it to fix setting PANGO_PREFIX. + 2005-12-27 Han-Wen Nienhuys * input/regression/stem-direction-context.ly: remove rest. diff --git a/lily/relocate.cc b/lily/relocate.cc index 2783973d63..d8efda1a41 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -50,6 +50,16 @@ set_env_file (char const *key, String value) return -1; } +static int +set_env_dir (char const *key, String value) +{ + if (is_dir (value)) + return sane_putenv (key, value, false); + else if (be_verbose_global) + warning (_f ("no such directory: %s for %s", value, key)); + return -1; +} + static int prepend_env_path (char const *key, String value) { @@ -127,7 +137,7 @@ set_relocation (String bindir, String prefix) SCM_MAJOR_VERSION, SCM_MINOR_VERSION)); set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc"); - sane_putenv ("PANGO_PREFIX", prefix, true); + set_env_dir ("PANGO_PREFIX", prefix); prepend_env_path ("PATH", bindir); } -- 2.39.5