From 46a3987f5f7d9cab5625ff2c02f082db48bbb452 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:07:05 +0000
Subject: [PATCH] lilypond-0.1.50

---
 Documentation/Rules.make |  2 +-
 bin/make-website.in      | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Documentation/Rules.make b/Documentation/Rules.make
index 37c33b2b34..b87154941d 100644
--- a/Documentation/Rules.make
+++ b/Documentation/Rules.make
@@ -19,7 +19,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex
 	mv $(notdir $@) $(outdir)
 
 $(outdir)/%.mudtex: %.doc
-	$(binout)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $<
+	$(depth)/$(bin)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $<
 
 $(outdir)/%.txt: $(outdir)/%.1
 	troff -man -Tascii $< | grotty -b -u -o > $@
diff --git a/bin/make-website.in b/bin/make-website.in
index 40420fb1d7..7820d45ff8 100644
--- a/bin/make-website.in
+++ b/bin/make-website.in
@@ -1,5 +1,5 @@
 #!@PYTHON@
-# 
+# -*-python-*-
 # make-website.py --  implement The lilypond WWW site
 # 
 # source file of the GNU LilyPond music typesetter
@@ -41,9 +41,9 @@ import glob
 
 depth = ''
 makewebsite_id = "<!make_website!>";
-id_str = "make-website 0.8";
+id_str = "make-website 0.9";
 tar = "tar";
-make = "make -f OLD-Makefile";
+make = "make -f Makefile";
 mailaddress = "unknown"
 fullname = "unknown"
 footstr = ""
@@ -56,7 +56,7 @@ def set_vars():
     __main__.lilyversion =  version_tuple_to_str(lilydirs.version_tuple())
     os.environ["TEXINPUTS"] = os.environ["TEXINPUTS"] + ":%s/input/:" % depth;
     
-    os.environ["LILYINCLUDE"] = join (':', __main__.include_path)
+    os.environ["LILYINCLUDE"] = join (':', __main__.include_path) +':'+ os.environ["LILYINCLUDE"];
     os.environ["LILYTOP"] = depth;
     __main__.mailaddress= os.environ['MAILADDRESS']
     pw = pwd.getpwuid (os.getuid());
@@ -87,7 +87,7 @@ def my_system(cmds):
 	ret = os.system (cmd)
 	if ret:
 	    if ignoreret: 
-		sys.stderr.write( "ignoring failed command \`%s\' (status %d)\n" % (cmd, ret))
+		sys.stderr.write( "ignoring failed command `%s\' (status %d)\n" % (cmd, ret))
 	    else:
 		sys.stderr.write( 'make-website: failed on command %s (status %d)\n' % (cmd, ret))
 		sys.exit (2)
@@ -116,7 +116,7 @@ mutopia_examples = [ "wtk1-fugue2",
 
 def gen_html():
     print 'generating HTML'
-    my_system (["make -f OLD-Makefile -kC .. html"]);
+    my_system (["make -f Makefile -kC .. html"]);
     
 
 def gen_examples(inputs):
@@ -224,7 +224,7 @@ def docxx_update():
     banner= open('/tmp/lilybanner.html', 'w');
     banner.write (footstr('../index.html'))
     banner.close ()
-    my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/out/make-docxx' % depth]);
+    my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/make-docxx' % depth]);
 #    os.unlink( "/tmp/lilybanner.html");
 
 def get_glob(exts):
@@ -249,7 +249,7 @@ def identify():
     print 'This is %s\n' % id_str
     
 def clean_tmp():
-    my_system(['rm -f /tmp/gs*'])
+    my_system(['-rm -f /tmp/gs*'])
     
 def get_top_of_NEWS():
     i = open('NEWS.txt')
@@ -288,7 +288,11 @@ def do_examples (examples, filename):
 def main():
     identify();
 
-    os.chdir (lilydirs.topdir + 'Documentation/out')
+    os.chdir (lilydirs.topdir + 'WWW')
+    
+    my_system (['-rm ../WWW/*.pod ../WWW/*.xpm ../WWW/*.doc',
+		'ln ../Documentation/*.pod ../Documentation/*.doc ../Documentation/*.xpm .']);
+    os.chdir (lilydirs.topdir + 'WWW/out')
     __main__.depth = "../../";
     __main__.include_path = map(lambda p: __main__.depth + '/' + 
 				p, __main__.include_path)
-- 
2.39.5