From 945cfb61da60cf7b500db8f768e29de3383f90c7 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 2 May 2006 08:53:02 +0000 Subject: [PATCH] (framework_relocation): remove old relocation stuff. --- ChangeLog | 4 ++++ lily/relocate.cc | 44 -------------------------------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2792696198..7db4d13f91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-05-02 Han-Wen Nienhuys + + * lily/relocate.cc (framework_relocation): remove old relocation stuff. + 2006-05-01 Mats Bengtsson * scm/define-grob-properties.scm (all-user-grob-properties): diff --git a/lily/relocate.cc b/lily/relocate.cc index 0bb084cf7f..8cb2b0861f 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -132,50 +132,6 @@ framework_relocation (string prefix) read_relocation_dir (prefix + "/etc/relocate/"); string bindir = prefix + "/bin"; - -#ifdef OLD_RELOCATION - string datadir = prefix + "/share"; - string libdir = prefix + "/lib"; - string sysconfdir = prefix + "/etc"; - - /* need otherwise dynamic .so's aren't found. */ - prepend_env_path ("DYLD_LIBRARY_PATH", libdir); - - set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf", true); - set_env_dir ("FONTCONFIG_PATH", sysconfdir + "/fonts"); - -#ifdef __MINGW32__ - char font_dir[PATH_MAX]; - ExpandEnvironmentStrings ("%windir%/fonts", font_dir, sizeof (font_dir)); - prepend_env_path ("GS_FONTPATH", font_dir); -#endif - - string gs_version = -#ifdef GHOSTSCRIPT_VERSION - GHOSTSCRIPT_VERSION -#else - "ghostscript-version-undefined" -#endif - ; - - if (char const *cur = getenv ("LILYPOND_GS_VERSION")) - gs_version = cur; - - prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/" + gs_version + "/fonts"); - prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/Resource"); - prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/lib"); - - prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts"); - prepend_env_path ("GS_LIB", datadir + "/gs/Resource"); - prepend_env_path ("GS_LIB", datadir + "/gs/lib"); - - prepend_env_path ("GUILE_LOAD_PATH", datadir - + to_string ("/guile/%d.%d", - SCM_MAJOR_VERSION, SCM_MINOR_VERSION)); - set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc"); - set_env_dir ("PANGO_PREFIX", prefix); - -#endif prepend_env_path ("PATH", bindir); } -- 2.39.5