]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' into topic/master-translation
authorJohn Mandereau <john.mandereau@gmail.com>
Tue, 27 Mar 2007 15:01:34 +0000 (17:01 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Tue, 27 Mar 2007 15:01:34 +0000 (17:01 +0200)
* master: (21 commits)
  Fix #281.
  Fix #51.
  Fix rest-dot-position.ly
  Fix collision-dots-move.ly
  formatting nit.
  also handle rests for dot positioning
  bugfix: don't return flag for invisible stems.
  Cleanup and simplify  dot column formatting logic.
  add prototypes.
  trim outdated comment
  Add Skyline::print_points(), Offset::swapped()
  make Dot_configuration into class, in new files dot-configuration.{cc,hh}
  use ly:progress for backend-svg
  always compile in Grob::instrumented_set_property
  whitespace cleanup.
  Edit docs translation instructions
  bump version
  use envp argument for main()
  strip LD_LIBRARY_PATH from inkscape call.
  Fix backend-svg.ly for ubuntu 6.06
  ...

1  2 
GNUmakefile.in

diff --combined GNUmakefile.in
index c9879725c8b6504c1237dea72e1fb82a98f7e7e1,40e50d542b5dc787b2b670dd2bdd837706501d44..f05ed3fe4d3ee51d0d48c15046aa8cd4973218bb
@@@ -98,7 -98,7 +98,7 @@@ local-WWW-post
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
        rm -rf $(outdir)/online-root
        rm -rf $(outdir)/offline-root
 -      $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
 +      $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
  
  
  tree-prefix = $(outdir)
@@@ -178,10 -178,13 +178,13 @@@ $(tree-share-prefix)/lilypond-force lin
  $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
        -rm -f $(tree-share-prefix)/fonts/otf/* &&  \
        rm -f $(tree-share-prefix)/fonts/svg/* &&  \
+       rm -f $(tree-share-prefix)/fonts/fonts.conf &&  \
        rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
        rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
                ln -s ../../../../../../mf/$(outconfbase)/*.otf .
+       -cd $(tree-share-prefix)/fonts/ && \
+               ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
        -cd $(tree-share-prefix)/fonts/tfm && \