From 813508f80540fac3670a67c82043bad41fec6a14 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 30 Sep 2003 20:36:42 +0000 Subject: [PATCH] * cygwin/lily-wins.py: Check whether to run ly2dvi or lilypond. * stepmake/stepmake/topdocs-targets.make (copy-to-top): Do not try to copy *png, index.html (Bertalan Fodor). --- ChangeLog | 5 +++++ cygwin/lily-wins.py | 8 ++++++-- stepmake/stepmake/topdocs-targets.make | 2 -- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14c542cd9b..2603e559a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-09-30 Jan Nieuwenhuizen + * cygwin/lily-wins.py: Check whether to run ly2dvi or lilypond. + + * stepmake/stepmake/topdocs-targets.make (copy-to-top): Do not + try to copy *png, index.html (Bertalan Fodor). + * Documentation/user/GNUmakefile: Remove bashism (Bertalan Fodor). * cygwin/mknetrel (preinstall): Set webdir (Bertalan Fodor). diff --git a/cygwin/lily-wins.py b/cygwin/lily-wins.py index 861668412c..299cfe46f8 100644 --- a/cygwin/lily-wins.py +++ b/cygwin/lily-wins.py @@ -78,8 +78,12 @@ if not pdfview: pdfview = 'xpdf' os.chdir (dir) -system ('/usr/bin/lilypond %s > %s.log 2>&1' % (escape_shell (base), - escape_shell (stem))) +if os.path.exists ('/usr/bin/ly2dvi'): + system ('/usr/bin/ly2dvi -p %s > %s.log 2>&1' % (escape_shell (base), + escape_shell (stem))) +else: + system ('/usr/bin/lilypond %s > %s.log 2>&1' % (escape_shell (base), + escape_shell (stem))) if not os.path.exists ('%(stem)s.pdf' % vars ()): # message box? sys.stderr.write ('pdf output not found\n') diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make index b2b0ec39cc..0a858bd45b 100644 --- a/stepmake/stepmake/topdocs-targets.make +++ b/stepmake/stepmake/topdocs-targets.make @@ -4,8 +4,6 @@ default: local-doc copy-to-top: $(TO_TOP_FILES) $(foreach i, $(TO_TOP_FILES), \ cp $(i) $(builddir) && ) true - -cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(builddir) - -cp $(outdir)/*png $(outdir)/index.html $(builddir) # don't fail when not making website local-WWW: $(HTML_FILES) copy-to-top -- 2.39.5