* 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).

diff --git a/ChangeLog b/ChangeLog
index 14c542cd9bb0cfad29378ce667c055b4d3e61e07..2603e559a3b9897fcdbf7fbaadb7345806aee0b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-09-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 861668412cf0a9b81cf8e7d675bc06fd2faa128d..299cfe46f8674fea421f259bf0eda3bd9cac3d21 100644 (file)
--- 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 b2b0ec39ccee3d83cfd26cb25470e74ff93e8e5b..0a858bd45b2ccafba47b485fc8bb4996ffbbb912 100644 (file)
--- 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