From: Jan Nieuwenhuizen <janneke@gnu.org> Date: Sun, 23 Oct 2005 18:58:02 +0000 (+0000) Subject: * scm/lily.scm: Remove horrendous running-from-gui? kludge. X-Git-Tag: release/2.7.15~28 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d7450e43c38fec4b09f6e9e4ea5f3c17ec36cebd;p=lilypond.git * scm/lily.scm: Remove horrendous running-from-gui? kludge. (lilypond-main): Redirect to gui-main if 'gui is set. Backportme. * scripts/midi2ly.py (datadir): Add libdir iso datadir to path, for alternative installations kludging s/share/lib/g LILYPONDPREFIX. Backportme. * SConstruct (libdir_package_version): Define. * python/SConscript: * python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so module in libdir. Backportme. --- diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 369e6df4cb..7a84bf7bc6 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -39,7 +39,7 @@ if os.environ.has_key ('LILYPONDPREFIX'): datadir = os.environ['LILYPONDPREFIX'] while datadir[-1] == os.sep: datadir= datadir[:-1] - libdir = datadir.replace ('/share/', '/lib/') + libdir = datadir.replace ('/share/', '/lib/') sys.path.insert (0, os.path.join (libdir, 'python'))