Failure to interpolate @lilypond_datadir@ in convert-ly etc.

[Ed Catmur]

http://bugs.gentoo.org/show_bug.cgi?id=132706#c64
> lilypond and lilypond-invoke-editor seem to work.
> all other executables give me an error: abc2ly, convert-ly, etf2ly,
> lilypond-book, and musicxml2ly complain about missing import lilylib:
> 
>     Traceback (most recent call last):
>       File "/usr/bin/convert-ly", line 41, in ?
>         import lilylib as ly
>     ImportError: No module named lilylib
> 
> midi2ly complains about missing import midi:
> 
>     Traceback (most recent call last):
>       File "/usr/bin/midi2ly", line 51, in ?
>         import midi
>     ImportError: No module named midi
> 
> 
> i can fix the errors concerning the lilylib import by creating a
symlink
> /usr/share/lilypond/current that points
to /usr/share/lilypond/2.10.16. this
> doesn't fix the missing "midi" import, though.

Problem is the chained sed in ./make/generic-rules.make etc:

 $(outdir)/%: %.in
        rm -f $@
        cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@

It appears that the variable sed doesn't apply to the results of the
file interpolation sed, so the insertion relocate-preamble.py.in doesn't
get the variables processed and we end up with:

for d in ['@lilypond_datadir@',
          '@lilypond_libdir@']:
    sys.path.insert (0, os.path.join (d, 'python'))

in /usr/bin/convert-ly etc.

Most obvious fix is to use a chained sed; patch attached.

Please respond; we need this fixed for Gentoo.

Ed Catmur

lilypond-2.10.16-interpolate-sed.patch
Description: Text Data