* cygwin/mknetrel: Remove PYTHONPATH and manpage workarounds.

[lilypond.git] / stepmake / bin / make-version.py

diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py
index 7888a7d0c1877f51c111d0e0305514efc2f65a9f..3c7089db81f6fb0ccac8c409c8f5f2225b215616 100644 (file)
--- a/stepmake/bin/make-version.py
+++ b/stepmake/bin/make-version.py
@@ -1,13 +1,19 @@
 
 import re
 import sys
-import getopt
 
 
+vf = 'VERSION'
+if sys.argv[1:]:
+       vf = sys.argv[1]
+
+f = open (vf)
+ls = f.readlines ()
 mypatch = 0
 defs = []
-for a in sys.argv[1:]:
-       m  = re.search ('([^ =]+)=([^ \t]*)', a)
+for l in ls:
+       l = re.sub ('#.*','', l)
+       m  = re.search ('([^ =]*)[\t ]*=[ \t]*([^ \t]*)[ \t]*\n', l)
        if m:
                defs.append ((m.group(1), m.group(2)))
 
@@ -28,6 +34,7 @@ for d in defs:
        
        sys.stdout.write ('#define %s "%s"\n' % d)
        
+
 if ('MY_PATCH_LEVEL', '') in defs:
        sys.stdout.write ('#define NO_MY_PATCHLEVEL')