1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.3836.2.43
diff -p -u -r1.3836.2.43 ChangeLog
--- ChangeLog 23 Oct 2005 19:04:01 -0000 1.3836.2.43
+++ ChangeLog 23 Oct 2005 19:15:00 -0000
@@ -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.
Index: SConstruct
===================================================================
RCS file: /cvsroot/lilypond/lilypond/SConstruct,v
retrieving revision 1.79
diff -p -u -r1.79 SConstruct
--- SConstruct 21 Apr 2005 14:28:31 -0000 1.79
+++ SConstruct 23 Oct 2005 19:15:00 -0000
@@ -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)
Index: python/GNUmakefile
===================================================================
RCS file: /cvsroot/lilypond/lilypond/python/GNUmakefile,v
retrieving revision 1.8
diff -p -u -r1.8 GNUmakefile
--- python/GNUmakefile 16 Jun 2005 11:54:02 -0000 1.8
+++ python/GNUmakefile 23 Oct 2005 19:15:00 -0000
@@ -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)
Index: python/SConscript
===================================================================
RCS file: /cvsroot/lilypond/lilypond/python/SConscript,v
retrieving revision 1.2
diff -p -u -r1.2 SConscript
--- python/SConscript 18 Apr 2005 13:35:13 -0000 1.2
+++ python/SConscript 23 Oct 2005 19:15:00 -0000
@@ -11,3 +11,4 @@ pym
cm
install (cm + pym, env['sharedir_package_version'] + '/python')
+install (cm, env['libdir_package_version'] + '/python')
Index: scripts/midi2ly.py
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scripts/midi2ly.py,v
retrieving revision 1.33
diff -p -u -r1.33 midi2ly.py
--- scripts/midi2ly.py 6 Jun 2005 14:27:42 -0000 1.33
+++ scripts/midi2ly.py 23 Oct 2005 19:15:00 -0000
@@ -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'))
################################################################
|
