2 ===================================================================
3 RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
4 retrieving revision 1.3836.2.43
5 diff -p -u -r1.3836.2.43 ChangeLog
6 --- ChangeLog 23 Oct 2005 19:04:01 -0000 1.3836.2.43
7 +++ ChangeLog 23 Oct 2005 19:15:00 -0000
9 * scm/lily.scm: Remove horrendous running-from-gui? kludge.
10 (lilypond-main): Redirect to gui-main if 'gui is set.
12 + * scripts/midi2ly.py (datadir): Add libdir iso datadir to path,
13 + for alternative installations kludging s/share/lib/g
16 + * SConstruct (libdir_package_version): Define.
18 + * python/SConscript:
19 + * python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so
22 2005-10-23 Erik Sandberg <mandolaerik@gmail.com>
24 * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.
26 ===================================================================
27 RCS file: /cvsroot/lilypond/lilypond/SConstruct,v
28 retrieving revision 1.79
29 diff -p -u -r1.79 SConstruct
30 --- SConstruct 21 Apr 2005 14:28:31 -0000 1.79
31 +++ SConstruct 23 Oct 2005 19:15:00 -0000
32 @@ -248,6 +248,8 @@ prefix = env['prefix']
33 bindir = os.path.join (prefix, 'bin')
34 sharedir = os.path.join (prefix, 'share')
35 libdir = os.path.join (prefix, 'lib')
36 +libdir_package = os.path.join (libdir, package.name)
37 +lidbir_package_version = os.path.join (libdir_package, version)
38 localedir = os.path.join (sharedir, 'locale')
39 sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
40 sharedir_package = os.path.join (sharedir, package.name)
41 Index: python/GNUmakefile
42 ===================================================================
43 RCS file: /cvsroot/lilypond/lilypond/python/GNUmakefile,v
44 retrieving revision 1.8
45 diff -p -u -r1.8 GNUmakefile
46 --- python/GNUmakefile 16 Jun 2005 11:54:02 -0000 1.8
47 +++ python/GNUmakefile 23 Oct 2005 19:15:00 -0000
48 @@ -10,7 +10,7 @@ USER_LDFLAGS=
49 INSTALLATION_OUT_SUFFIXES=1
51 INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)
52 -INSTALLATION_OUT_DIR=$(local_lilypond_datadir)/python
53 +INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
55 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
56 INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
57 Index: python/SConscript
58 ===================================================================
59 RCS file: /cvsroot/lilypond/lilypond/python/SConscript,v
60 retrieving revision 1.2
61 diff -p -u -r1.2 SConscript
62 --- python/SConscript 18 Apr 2005 13:35:13 -0000 1.2
63 +++ python/SConscript 23 Oct 2005 19:15:00 -0000
67 install (cm + pym, env['sharedir_package_version'] + '/python')
68 +install (cm, env['libdir_package_version'] + '/python')
69 Index: scripts/midi2ly.py
70 ===================================================================
71 RCS file: /cvsroot/lilypond/lilypond/scripts/midi2ly.py,v
72 retrieving revision 1.33
73 diff -p -u -r1.33 midi2ly.py
74 --- scripts/midi2ly.py 6 Jun 2005 14:27:42 -0000 1.33
75 +++ scripts/midi2ly.py 23 Oct 2005 19:15:00 -0000
76 @@ -30,12 +30,18 @@ import sys
77 ################################################################
78 # Users of python modules should include this snippet.
80 -# This soon to be removed for: import lilypond.lilylib as ly
81 libdir = '@local_lilypond_libdir@'
82 if not os.path.isdir (libdir):
83 libdir = '@lilypond_libdir@'
84 -sys.path.insert (0, os.path.join (libdir, 'python'))
87 +if os.environ.has_key ('LILYPONDPREFIX'):
88 + datadir = os.environ['LILYPONDPREFIX']
89 + while datadir[-1] == os.sep:
90 + datadir= datadir[:-1]
91 + libdir = datadir.replace ('/share/', '/lib/')
93 +sys.path.insert (0, os.path.join (libdir, 'python'))
95 ################################################################