From a34b6c818f7168053cfa5fbcdd60e1b09db34ac8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 23 Sep 2003 17:10:42 +0000 Subject: [PATCH] * make/ly-rules.make: Test for files instead of touching void and ignoring errors. * GNUmakefile.in: * make/lilypond.redhat.spec.in: * debian/rules: Fix lilypond.words stuff a bit. For running from , adding --- ChangeLog | 12 ++++++++++++ GNUmakefile.in | 9 ++++++++- debian/rules | 2 +- make/lilypond.mandrake.spec.in | 2 -- make/lilypond.redhat.spec.in | 2 -- make/ly-rules.make | 10 ++++------ 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b3bc3dce0..e05ec6ba54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2003-09-23 Jan Nieuwenhuizen + * make/ly-rules.make: Test for files instead of touching void and + ignoring errors. + + * GNUmakefile.in: + * make/lilypond.redhat.spec.in: + * debian/rules: Fix lilypond.words stuff a bit. For running from + , adding + + (push "/share/lilypond/elisp" load-path) + + to your ~/.emacs.el should give you LilyPond-mode again. + * scripts/lilypond-book.py (re_dict): Only fix texinfo @mbinclude regexp for DOS/Windows, we are too paranoid to fix others. diff --git a/GNUmakefile.in b/GNUmakefile.in index 2ed8bf5826..8a13e2051c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -33,9 +33,12 @@ include $(depth)/make/stepmake.make doc: $(MAKE) -C Documentation -lilypond.words: +LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim +$(LILYPOND_WORDS): $(srcdir)/lily/my-lily-lexer.cc $(buildscript-dir)/lilypond.words.py $(srcdir)/scm/new-markup.scm $(srcdir)/ly/engraver-init.ly cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir) +all: $(LILYPOND_WORDS) + web-install: -$(INSTALL) -m 755 -d $(webdir) tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz @@ -94,6 +97,7 @@ $(builddir)/share/lilypond-force: cd $(builddir) && rm -rf lib share mkdir -p $(builddir)/lib/lilypond mkdir -p $(builddir)/share/lilypond + mkdir -p $(builddir)/share/lilypond/elisp mkdir -p $(builddir)/share/lilypond/fonts mkdir -p $(builddir)/share/lilypond/tex cd $(builddir)/lib/lilypond && \ @@ -115,6 +119,9 @@ $(builddir)/share/lilypond-force: ln -s ../../../mf/$(outconfbase) afm && \ ln -s ../../../mf/$(outconfbase) tfm && \ ln -s ../../../mf/$(outconfbase) type1 + cd $(builddir)/share/lilypond/elisp && \ + ln -sf ../../../$(outconfbase)/lilypond.words.el . && \ + ln -s $(abs-srcdir)/*.el . $(foreach i,$(CATALOGS), \ mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \ cd $(builddir)/share/locale/$i/LC_MESSAGES && \ diff --git a/debian/rules b/debian/rules index 972a801590..768d33c3d5 100644 --- a/debian/rules +++ b/debian/rules @@ -123,7 +123,7 @@ binary-arch: build install dh_testdir dh_testroot cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \ - buildscripts/out/lilypond.words.el \ + out/lilypond.words.el \ $(r)/usr/share/emacs/site-lisp/ dh_installdocs AUTHORS.txt NEWS.txt README.txt \ DEDICATION THANKS diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index d300cd5d42..2ee1f4bf63 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -73,8 +73,6 @@ unset out %make MAKE_PFA_FILES=1 all make -C mf/ pfa -make lilypond.words - # make info make -C Documentation diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 7f14e4c389..5204df4007 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -50,8 +50,6 @@ Documentation and example files of LilyPond. An index is available at make MAKE_PFA_FILES=1 all make -C mf/ pfa -make lilypond.words - # make info make -C Documentation diff --git a/make/ly-rules.make b/make/ly-rules.make index f270389fbb..261a5b7355 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -1,23 +1,21 @@ -# Mudela_rules.make - .SUFFIXES: .doc .dvi .mudtex .tely .texi .ly $(outdir)/%.latex: %.doc - -chmod a+w $@ + if [ -f $@ ]; then chmod a+w $@; fi $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $< chmod -w $@ # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds $(outdir)/%.texi: %.tely - -chmod a+w $@ + if [ -f $@ ]; then chmod a+w $@; fi set|egrep '(TEX|LILY)' # ugh, what's this? $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< chmod -w $@ $(outdir)/%.texi: $(outdir)/%.tely - -chmod a+w $@ + if [ -f $@ ]; then chmod a+w $@; fi # debugging: # set|egrep '(TEX|LILY)' $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< @@ -29,7 +27,7 @@ $(outdir)/%.texi: $(outdir)/%.tely # nexi: no-lily texi # for plain info doco: don't run lily $(outdir)/%.nexi: %.tely - -chmod a+w $@ + if [ -f $@ ]; then chmod a+w $@; fi $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) -o $(notdir $@) $< chmod -w $@ -- 2.39.2