(bindir): add dynamic

relocation. Backportme.

diff --git a/ChangeLog b/ChangeLog
index 28487a3b6ba33713b29f0d4486885c7c4ad31c69..c01c5806fd4492a293246420bdc346eb5a5ffcfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scripts/musicxml2ly.py (bindir): add dynamic
+       relocation. Backportme.
+
 2006-04-04  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ basic-notation, advanced-notation, putting,

diff --git a/VERSION b/VERSION
index 5ab0ec392e355b82f99ff0628a0b1d1e6885bdc3..94c00a4cecab7fcadf2ed6e2202aea7094ca1976 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=9
-PATCH_LEVEL=1
+PATCH_LEVEL=2
 MY_PATCH_LEVEL=
 

diff --git a/configure.in b/configure.in
index 92e53a0515b60248432b49ee6b306dee702a322c..9323c37602c58aaea8ee3ca041e8f15157bdd6e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -54,10 +54,10 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED, 2.2)
-STEPMAKE_GCC(REQUIRED, 2.8)
+STEPMAKE_PYTHON(REQUIRED, 2.3)
+STEPMAKE_GCC(REQUIRED, 4.0)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.0.5)
+STEPMAKE_GXX(REQUIRED, 4.0)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)
@@ -74,13 +74,13 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
-STEPMAKE_MAKEINFO(REQUIRED)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.7)
+STEPMAKE_MAKEINFO(REQUIRED, 4.8)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 4b5abf9a7061f450fc1fe46b95645adf96cd7294..15bbb2ba6582cbabf5703886e18ca2eed6026414 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -23,6 +23,14 @@ elif os.path.exists (os.path.join (datadir, 'share/lilypond/current/')):
 
 sys.path.insert (0, os.path.join (datadir, 'python'))
 
+# dynamic relocation, for GUB binaries.
+bindir = os.path.split (sys.argv[0])[0]
+
+for prefix_component in ['share', 'lib']:
+       datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % prefix_component)
+       sys.path.insert (0, datadir)
+
+
 
 import musicxml
 import musicexp