* 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 369e6df4cb0482bf2ec9d9228a6694ca00b48ad7..7a84bf7bc61b4f32063edf5845a3b31bd88749ec 100644 (file)
--- 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'))