diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | make/lilypond-vars.make | 7 | ||||
| -rw-r--r-- | scripts/lilypond-book.py | 4 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2006-01-06 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * scripts/lilypond-book.py (invokes_lilypond): allow . in path to + lilypond binary too. + +2006-01-05 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * make/mutopia-rules.make (Module): use LILYPOND_BINARY + 2006-01-06 Jan Nieuwenhuizen <janneke@gnu.org> * make/ly-rules.make: diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 13d5e46262..bd8d172f2e 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -7,7 +7,12 @@ export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION) export DVIPSHEADERS:=$(top-build-dir)/mf/out:: export LILYPOND_BINARY=$(top-build-dir)/lily/$(outconfbase)/lilypond else -export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH) + +## better not take the binaries from a precompiled bundle, as they +## rely on env vars for relocation. +## + +#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH) export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY) endif diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 75c5c14c81..7d8fc2de13 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -674,7 +674,7 @@ def split_options (option_string): return [] def invokes_lilypond (): - return re.search ('^[\'\"0-9A-Za-z/]*lilypond', process_cmd) + return re.search ('^[\'\"0-9A-Za-z/.]*lilypond', process_cmd) def set_default_options (source): global default_ly_options @@ -1301,7 +1301,7 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets): # UGH # the --process=CMD switch is a bad idea # it is too generic for lilypond-book. - if texstr_names and invokes_lilypond: + if texstr_names and invokes_lilypond (): my_system (string.join ([cmd, '--backend texstr', 'snippet-map.ly'] + texstr_names)) for l in texstr_names: |