*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index bffe5238de51f9d028c221e23613291881df5a79..718bc05d7bd9f41bbbc796acb3352e70625dfe34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/main.cc (setup_paths)[!__MINGW32__]: Bugfix: if argv0 is
+       not absolute, make it absolute using PATH.
+
+2005-10-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * python/midi.c (initmidi): Fix type for mingw.
+
 2005-10-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/stepmake/compile-vars.make (SHARED_FLAGS): Support mingw.

diff --git a/lily/main.cc b/lily/main.cc
index f75b458f4a348aad761c2a0c9a75eceed9344a4a..a89edb1844caf6e644eea0f4911403cb0e8bee72 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -320,7 +320,13 @@ setup_paths (char const* argv0)
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
+#ifndef __MINGW32__
+  File_path p;
+  p.parse_path (getenv ("PATH"));
+  String bindir = dir_name (p.find (argv0));
+#else /* __MINGW32__ */
   String bindir = dir_name (argv0);
+#endif  
   String argv0_prefix = dir_name (bindir);
   if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
     {

diff --git a/python/GNUmakefile b/python/GNUmakefile
index 400828d53fed5c4a6400169f13ce24bb2c6fd57b..360bc297568e34c5fc5f120d6a1ef51787ae0d8e 100644 (file)
--- a/python/GNUmakefile
+++ b/python/GNUmakefile
@@ -4,6 +4,7 @@ STEPMAKE_TEMPLATES=c python-module install-out po
 
 include $(depth)/make/stepmake.make
 
+CFLAGS += -DPy_BUILD_CORE
 # unset al guile stuff from configure
 USER_LDFLAGS=
 

diff --git a/python/midi.c b/python/midi.c
index 5d5e7fba470c3c0954fbc8bc05d4cc3dde51c255..4570cbfba5a34c31a09acdafcaadde937e44b728 100644 (file)
--- a/python/midi.c
+++ b/python/midi.c
@@ -399,8 +399,8 @@ static PyMethodDef MidiMethods[] =
   {0, 0}        /* Sentinel */
 };
 
-void
-initmidi ()
+PyMODINIT_FUNC
+initmidi (void)
 {
   PyObject *m, *d;
   m = Py_InitModule ("midi", MidiMethods);