changeset 5769:6d3890c615b5

lilypond-ancient: texlive and guile header hacks. Fixes build.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 13 Oct 2009 14:13:42 +0200
parents 01db42751267
children 79f5a7bf2fd8
files gub/specs/lilypond-ancient.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/lilypond-ancient.py	Tue Oct 13 14:05:35 2009 +0200
+++ b/gub/specs/lilypond-ancient.py	Tue Oct 13 14:13:42 2009 +0200
@@ -19,7 +19,7 @@
     make_flags = (lilypond.LilyPond__simple.make_flags
                   + ' builddir=%(builddir)s'
                   + ' config=%(builddir)s/config.make')
-    configure_command = ('CFLAGS=-I%(system_prefix)s/include '
+    configure_command = (''' CFLAGS='-I%(system_prefix)s/include -DGUILE_MINOR_VERSION=SCM_MINOR_VERSION' '''
                          + ' LDFLAGS=-L%(system_prefix)s/lib '
                          + lilypond.LilyPond__simple.configure_command)
     def __init__ (self, settings, source):
@@ -39,6 +39,9 @@
                 ('(^STEPMAKE_BISON\()REQUIRED', r'\1OPTIONAL'),
                 #], '%(srcdir)s/configure.in')
                 ], '%(srcdir)s/configure')
+        # FIXME: PROMOTME to texlive.
+        self.file_sub ([('^(#include <kpathsea/getopt.h>)', r'//\1'),],
+                       '%(system_prefix)s/include/kpathsea/kpathsea.h')
         def defer (logger):
             srcdir = self.expand ('%(srcdir)s')
             base = srcdir[:srcdir[1:].find ('/') + 1]