(framework_relocation): remove old relocation stuff.

diff --git a/ChangeLog b/ChangeLog
index 279269619892ca173727ee98b958a00eacb0308f..7db4d13f9130a7cebc7da968e35939b4e57f70f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/relocate.cc (framework_relocation): remove old relocation stuff.
+
 2006-05-01  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * scm/define-grob-properties.scm (all-user-grob-properties):

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 0bb084cf7fe7c14e60bb9cc47c1033b901d0bbcd..8cb2b0861f25636ad4a01b3d603777e47f892a5a 100644 (file)
--- 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);
 }