* scripts/midi2ly.py (datadir): Add libdir iso datadir to path,

for alternative installations kludging s/share/lib/g
LILYPONDPREFIX.

* SConstruct (libdir_package_version): Define.

* python/SConscript:
* python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so
module in libdir.

diff --git a/ChangeLog b/ChangeLog
index 3b47fb73bcf81d2eaedfefb6d8107b5e01e46423..7adfbd6edfeec4ee3b9599849c96fff9fd7a5d48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,16 @@
        * scm/lily.scm: Remove horrendous running-from-gui? kludge.
        (lilypond-main): Redirect to gui-main if 'gui is set.
 
+       * scripts/midi2ly.py (datadir): Add libdir iso datadir to path,
+       for alternative installations kludging s/share/lib/g
+       LILYPONDPREFIX.
+
+       * SConstruct (libdir_package_version): Define.
+
+       * python/SConscript: 
+       * python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so
+       module in libdir.
+
 2005-10-23  Erik Sandberg  <mandolaerik@gmail.com>
 
        * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.

diff --git a/SConstruct b/SConstruct
index d4c847f046c6834d1fbb2f8ce8a683b86f6bfe9d..5d5909df9aa4072254648bcf5bfca6a61086571c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -248,6 +248,8 @@ prefix = env['prefix']
 bindir = os.path.join (prefix, 'bin')
 sharedir = os.path.join (prefix, 'share')
 libdir = os.path.join (prefix, 'lib')
+libdir_package = os.path.join (libdir, package.name)
+lidbir_package_version = os.path.join (libdir_package, version)
 localedir = os.path.join (sharedir, 'locale')
 sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
 sharedir_package = os.path.join (sharedir, package.name)

diff --git a/python/GNUmakefile b/python/GNUmakefile
index 3600ab22d78c770e26b0411f5b25fedb512e3f0c..bc9d2baeb50567add55e31853f82b5c834c2fd44 100644 (file)
--- a/python/GNUmakefile
+++ b/python/GNUmakefile
@@ -10,7 +10,7 @@ USER_LDFLAGS=
 INSTALLATION_OUT_SUFFIXES=1
 
 INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)
-INSTALLATION_OUT_DIR=$(local_lilypond_datadir)/python
+INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
 
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
 INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)

diff --git a/python/SConscript b/python/SConscript
index a621d146d0ad5844cd27ddeec3d43c253a0bb40c..d0c94df0cf496371b4031ec9f7e4b52493a7651c 100644 (file)
--- a/python/SConscript
+++ b/python/SConscript
@@ -11,3 +11,4 @@ pym
 cm
 
 install (cm + pym, env['sharedir_package_version'] + '/python')
+install (cm, env['libdir_package_version'] + '/python')

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 8726c8d59f8231ac148ba1691e2b07e2af2f0186..7a84bf7bc61b4f32063edf5845a3b31bd88749ec 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -30,12 +30,18 @@ import sys
 ################################################################
 # Users of python modules should include this snippet.
 #
-# This soon to be removed for: import lilypond.lilylib as ly
 libdir = '@local_lilypond_libdir@'
 if not os.path.isdir (libdir):
        libdir = '@lilypond_libdir@'
-sys.path.insert (0, os.path.join (libdir, 'python'))
 
+# ugh
+if os.environ.has_key ('LILYPONDPREFIX'):
+       datadir = os.environ['LILYPONDPREFIX']
+       while datadir[-1] == os.sep:
+               datadir= datadir[:-1]
+       libdir = datadir.replace ('/share/', '/lib/')
+
+sys.path.insert (0, os.path.join (libdir, 'python'))
 
 ################################################################