From 496e1cb13e5d5a8fd4cebe7f2ea8b2e4388dbecf Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:56 +0000
Subject: [PATCH] lilypond-0.1.49

---
 ChangeLog                      |  1 +
 Documentation/Makefile.am.wild | 30 ++++++++++++++++++++++++++++++
 bin/lilypython.py              | 18 ++++++++++++------
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 ChangeLog
 create mode 100644 Documentation/Makefile.am.wild

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000000..e1b28ead74
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+oeps: no more details than NEWS
diff --git a/Documentation/Makefile.am.wild b/Documentation/Makefile.am.wild
new file mode 100644
index 0000000000..bed4314551
--- /dev/null
+++ b/Documentation/Makefile.am.wild
@@ -0,0 +1,30 @@
+# Documentation/Makefile.am.wild
+
+DOCFILES = $(wildcard *.doc)
+PODFILES = $(wildcard *.pod)
+OUTPODFILES = $(PODFILES)
+TEXTFILES = $(OUTPODFILES:.pod=.txt)
+GROFFFILES = $(OUTPODFILES:.pod=.1)
+HTMLFILES = $(OUTPODFILES:.pod=.html)
+DVIFILES = $(DOCFILES:.doc=.dvi)
+
+XPMS = $(wildcard *.xpm)
+giffiles = $(XPMS:.xpm=.gif)
+
+EXTRA_DIST = Makefile.am.wild Rules.make $(XPMS) $(DOCFILES) $(PODFILES) vocabulary-data vocabulary-forms.el 
+
+MAN1FILES = lilypond convert-mudela mi2mu mudela-book ly2dvi
+MAN1GROFF = $(addsuffix .1,$(MAN1FILES))
+
+default: all $(TEXTFILES)
+
+outdir = .
+
+install-data: $(outdir)/lilypond.1
+	$(INSTALL) -d $(mandir)/man1
+	$(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
+
+uninstall-data:
+	(cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
+
+include Rules.make
diff --git a/bin/lilypython.py b/bin/lilypython.py
index 6f329a8614..06ad6459d5 100644
--- a/bin/lilypython.py
+++ b/bin/lilypython.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!/usr/bin/python
 
 # 
 # lily-python.py --  implement general LilyPond-wide python stuff
@@ -22,7 +22,9 @@ import getopt
 
 
 version_re = regex.compile('\\version *\"\(.*\)\"')
-make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$')
+# now used as shell script in configure too!
+# make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$')
+make_assign_re = regex.compile('^\([A-Z_]*\)=\(.*\)$')
 
 def version_tuple(file):
     lines = file.readlines()
@@ -34,13 +36,17 @@ def version_tuple(file):
 	if make_assign_re.search(l) <> -1:
 	    nm = make_assign_re.group(1)
 	    val = make_assign_re.group(2)
-	    if nm == 'TOPLEVEL_MAJOR_VERSION':
+#	    if nm == 'TOPLEVEL_MAJOR_VERSION':
+	    if nm == 'MAJOR_VERSION':
 		mj = atoi(val)
-	    elif nm == 'TOPLEVEL_MINOR_VERSION':
+#	    elif nm == 'TOPLEVEL_MINOR_VERSION':
+	    elif nm == 'MINOR_VERSION':
 		mi = atoi(val)
-	    elif nm == 'TOPLEVEL_PATCH_LEVEL':
+#	    elif nm == 'TOPLEVEL_PATCH_LEVEL':
+	    elif nm == 'PATCH_LEVEL':
 		pa = atoi(val)
-	    elif nm == 'TOPLEVEL_MY_PATCH_LEVEL':
+#	    elif nm == 'TOPLEVEL_MY_PATCH_LEVEL':
+	    elif nm == 'MY_PATCH_LEVEL':
 		mp = val
     return (mj,mi,pa,mp)
 
-- 
2.39.5