* make/stepmake.make: include toplevel-version.make after config.make.

* stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.
also allow python2.4

* stepmake/aclocal.m4: don't do non-srcdir build with
symlinks. Use inclusion, so the src directory name can be changed.

diff --git a/ChangeLog b/ChangeLog
index a4937f7b315ba5c259f6aa97c9eba1e98657340a..74a5d3493964e4be6a1da5a1288c3bfdd002ddb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * python/convertrules.py (conv): add warning about drums. 
+
        * make/stepmake.make: include toplevel-version.make after config.make.
 
        * stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.

diff --git a/make/toplevel-version.make b/make/toplevel-version.make
index 0dcf5ed9a09818d27265bd9a28316ea1d174700c..33b61b4ed13cf3aec47d26a54d6bb59ec14c2671 100644 (file)
--- a/make/toplevel-version.make
+++ b/make/toplevel-version.make
@@ -1,6 +1,11 @@
 # Toplevel_version.make
 
+ifeq ($(configure-srcdir), .) 
+include $(depth)/VERSION
+else
 include $(configure-srcdir)/VERSION
+endif
+
 TOPLEVEL_MAJOR_VERSION=$(MAJOR_VERSION)
 TOPLEVEL_MINOR_VERSION=$(MINOR_VERSION)
 TOPLEVEL_PATCH_LEVEL=$(PATCH_LEVEL)

diff --git a/python/convertrules.py b/python/convertrules.py
index 7453a495b39428927cf95d6b78a8e9cf1afde785..bf0e4d1aa8435c2bbfe5f59cd646a348b9803b3c 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -1818,7 +1818,11 @@ conversions.append (((2,1,18), conv, """\\newpartcombine -> \\partcombine,
 
 
 def conv (str):
+       if re.search ('include "drumpitch', str):
+               error_file.write ("Drums found. Enclose drum notes in \\drummode")
+               
        str = re.sub (r'\\include "drumpitch-init.ly"','', str)
+       
        str = re.sub (r'\\pitchnames ','pitchnames = ', str)
        str = re.sub (r'\\chordmodifiers ','chordmodifiers = ', str)
        str = re.sub (r'\bdrums\b\s*=','drumContents = ', str)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 35ead69eace48080bf23a98c4576be64827958a5..46db83eb9926d6c8a5010acb76e81264cbad486c 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -692,7 +692,9 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(ugh_ugh_autoconf250_builddir)
 
     # use absolute path.
-    srcdir=$(cd $srcdir;  pwd)
+    if [ "$srcdir" != "." ];  then 
+       srcdir=$(cd $srcdir;  pwd)
+    fi
     
     AC_SUBST(srcdir)
     AC_SUBST(stepmake)