From f5f6129d775cd859f89e21322c4582b28b5354c5 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 13 Nov 2005 18:20:23 +0000
Subject: [PATCH] * 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.
---
ChangeLog | 2 ++
make/toplevel-version.make | 5 +++++
python/convertrules.py | 4 ++++
stepmake/aclocal.m4 | 4 +++-
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index a4937f7b31..74a5d34939 100644
--- 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 0dcf5ed9a0..33b61b4ed1 100644
--- 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 7453a495b3..bf0e4d1aa8 100644
--- 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 35ead69eac..46db83eb99 100644
--- 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)
--
2.39.5